diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-25 22:39:21 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-25 22:39:21 +0100 |
| commit | 72af508bdbca55d0752aab3369faa1dc944a04e7 (patch) | |
| tree | 933b60b160f1876990bb02bab20fcdb491c8b560 /vendor/ubuntu | |
| parent | b52e8ce26ee0ee906f8bad4dbd72eca51fb65ed7 (diff) | |
| parent | e093518c03b49a2def83d8b680be4490fed6e69c (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
debian/changelog
doc/apt-verbatim.ent
doc/po/apt-doc.pot
po/ar.po
po/ast.po
po/bg.po
po/bs.po
po/ca.po
po/cs.po
po/cy.po
po/da.po
po/de.po
po/dz.po
po/el.po
po/es.po
po/eu.po
po/fi.po
po/fr.po
po/gl.po
po/hu.po
po/it.po
po/ja.po
po/km.po
po/ko.po
po/ku.po
po/lt.po
po/mr.po
po/nb.po
po/ne.po
po/nl.po
po/nn.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/sk.po
po/sl.po
po/sv.po
po/th.po
po/tl.po
po/tr.po
po/uk.po
po/vi.po
po/zh_CN.po
po/zh_TW.po
Diffstat (limited to 'vendor/ubuntu')
| -rw-r--r-- | vendor/ubuntu/sources.list.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/ubuntu/sources.list.in b/vendor/ubuntu/sources.list.in index b9aa8c3d0..00db2f8cd 100644 --- a/vendor/ubuntu/sources.list.in +++ b/vendor/ubuntu/sources.list.in @@ -1,5 +1,5 @@ - # See sources.list(5) manpage for more information - # Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted |