summaryrefslogtreecommitdiff
path: root/doc/apt-verbatim.ent
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-06-10 19:00:41 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-06-10 19:00:41 +0200
commitafaeea148553439684e6091f282bf5a4ee5c00d6 (patch)
tree9de4549d414a78bed64a2a20f7941695c7d6c4df /doc/apt-verbatim.ent
parentb4278cc96fa0184b4f522e2bcfe82bd8eba93595 (diff)
parenteea0f3a6197dba565c5df349ed06c0a70b49b77f (diff)
Merge branch 'debian/sid' into ubuntu/master1.0.4ubuntu1
Conflicts: configure.ac debian/changelog
Diffstat (limited to 'doc/apt-verbatim.ent')
-rw-r--r--doc/apt-verbatim.ent2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index b25cd7375..51ad08b83 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.0.3">
+<!ENTITY apt-product-version "1.0.4">
<!-- (Code)names for various things used all over the place -->
<!ENTITY oldstable-codename "squeeze">