diff options
| author | Michael Vogt <mvo@debian.org> | 2014-07-10 13:16:50 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-07-10 13:16:50 +0200 |
| commit | 343325f4cc460b709fc929f85bc2a3d4691d63fe (patch) | |
| tree | f942f9ce2776a1c0653570615c87c80301021725 /doc/apt-verbatim.ent | |
| parent | fdff5b03e981ace063269640001b3bc8f9a42f4c (diff) | |
| parent | 881de4cd8d432313e0ede1cc5857cae5b217e6d2 (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
configure.ac
debian/changelog
doc/apt-verbatim.ent
doc/po/apt-doc.pot
doc/po/fr.po
po/ar.po
po/ast.po
po/bg.po
po/bs.po
po/ca.po
po/cs.po
po/cy.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/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/zh_CN.po
po/zh_TW.po
Diffstat (limited to 'doc/apt-verbatim.ent')
| -rw-r--r-- | doc/apt-verbatim.ent | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index cb081e478..b9d3d11da 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -225,7 +225,7 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "1.1~exp1"> +<!ENTITY apt-product-version "1.0.6"> <!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> |