summaryrefslogtreecommitdiff
path: root/vendor/debian/sources.list.in
AgeCommit message (Collapse)Author
2013-12-05Merge branch 'debian/sid' into ubuntu/masterMichael Vogt
Conflicts: apt-pkg/deb/dpkgpm.cc cmdline/apt-key.in debian/control doc/apt-key.8.xml doc/makefile doc/po/apt-doc.pot doc/po/de.po doc/po/es.po doc/po/fr.po doc/po/it.po doc/po/ja.po doc/po/pl.po doc/po/pt.po doc/po/pt_BR.po
2013-11-30introduce a vendor system to change sources.listDavid Kalnischkies
Many derivatives make quiet a few simple changes to apt introducing silly diffs just to change examples and co making it harder for them to update apt and harder for us to merge real changes back. First stop: doc/examples/sources.list