diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-01-29 21:33:24 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-01-29 21:33:24 +0000 |
| commit | b478e4f4fa57a479f959f2e797f64e871c1c67c8 (patch) | |
| tree | d34c1096018967dc623c3aa5105c48de630336dd | |
| parent | 19e4a9cf5c11e40f7e74d5402d67ec9130d14a8c (diff) | |
| download | wireshark-b478e4f4fa57a479f959f2e797f64e871c1c67c8.tar.gz wireshark-b478e4f4fa57a479f959f2e797f64e871c1c67c8.tar.bz2 wireshark-b478e4f4fa57a479f959f2e797f64e871c1c67c8.zip | |
Add some release note updates.wireshark-1.8.5
svn path=/trunk-1.8/; revision=47354
| -rw-r--r-- | docbook/release-notes.xml | 4 | ||||
| -rw-r--r-- | version.conf | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml index ac828f4323..1d158c4301 100644 --- a/docbook/release-notes.xml +++ b/docbook/release-notes.xml @@ -181,7 +181,7 @@ Wireshark Info (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7679">Bug 7679</ulink>) </para> - <para>Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.</para> + <para>Versions affected: 1.8.0 to 1.8.4.</para> <para> <ulink url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=GENERIC-MAP-NOMATCH">GENERIC-MAP-NOMATCH</ulink> </para> @@ -232,8 +232,6 @@ Wireshark Info <!-- Fixed in trunk: 47248 --> <!-- Fixed in trunk-1.8: r47282 --> <!-- Fixed in trunk-1.6: 47291 --> - (<ulink url="https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=X">Bug - X</ulink>) </para> <para>Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.</para> <para> diff --git a/version.conf b/version.conf index 4e358d2d42..37bef0baf7 100644 --- a/version.conf +++ b/version.conf @@ -1,9 +1,9 @@ # Interim releases: Enable packaging, add a "pre" to the version. -#enable: 1 -#pkg_format: pre1-%# -#pkg_enable: 1 +enable: 1 +pkg_format: pre1-%# +pkg_enable: 1 # Final release: Disable package version stamps. -enable: 1 -pkg_format: -pkg_enable: 0 +#enable: 1 +#pkg_format: +#pkg_enable: 0 |