diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-23 00:45:56 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-23 00:45:56 +0100 |
| commit | eccff323a093d91fff379e7c8460d7e5c8db8ad1 (patch) | |
| tree | d539d21c6716af3122edabae91feadccfb3c12ad /doc/apt-verbatim.ent | |
| parent | 2c678b0a026ac9d44c8ade07aa8bf318faf5a9e2 (diff) | |
| parent | b7ed961b8099c05f65e18d4c73ead50cc5c8bff1 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'doc/apt-verbatim.ent')
| -rw-r--r-- | doc/apt-verbatim.ent | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 966ca2b0f..b9e6a881a 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -219,13 +219,14 @@ "> <!-- this will be updated by 'prepare-release' --> -<!ENTITY apt-product-version "0.9.15.3"> +<!ENTITY apt-product-version "0.9.15.4"> <!-- (Code)names for various things used all over the place --> <!ENTITY oldstable-codename "squeeze"> <!ENTITY stable-codename "wheezy"> <!ENTITY testing-codename "jessie"> <!ENTITY stable-version "7"> +<!ENTITY tanglu-codename "bartholomea"> <!ENTITY ubuntu-codename "trusty"> <!-- good and bad just refers to matching and not matching a pattern… |