summaryrefslogtreecommitdiff
path: root/doc/style.txt
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-12-05 08:24:00 +0100
committerMichael Vogt <mvo@debian.org>2013-12-05 08:24:00 +0100
commit44633bd7cac1ce68d4e475285a0f45b7a8952a7f (patch)
tree3e3af83bb955b9f49f38239d490b5173bb0b9ac4 /doc/style.txt
parentb10b0c4aac5d0648125d4203eea6900032efb7ba (diff)
parent7014e1482942d00b66eb30061b0cf5d2a7b3ebf3 (diff)
Merge branch 'debian/sid' into ubuntu/master
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
Diffstat (limited to 'doc/style.txt')
0 files changed, 0 insertions, 0 deletions