diff options
author | Gerald Combs <gerald@wireshark.org> | 2017-06-28 13:21:51 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2017-06-28 20:25:19 +0000 |
commit | e7935f456885b2aa376d96937f113bfc68e15eb3 (patch) | |
tree | 6f8010e799c8fa75f11a86d389c479833afd40a5 | |
parent | 739ff7576460e3cb98bee6858a6cbf3e0ca18e89 (diff) | |
download | wireshark-e7935f456885b2aa376d96937f113bfc68e15eb3.tar.gz |
2.4.0rc2 → 2.4.0rc3.
Change-Id: I7a76b96edc76ef0daf099c6bcaeb9b25d9cc5a75
Reviewed-on: https://code.wireshark.org/review/22449
Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r-- | docbook/attributes.asciidoc | 2 | ||||
-rw-r--r-- | version.conf | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/docbook/attributes.asciidoc b/docbook/attributes.asciidoc index cf7c26a5b5..857071cafe 100644 --- a/docbook/attributes.asciidoc +++ b/docbook/attributes.asciidoc @@ -1,6 +1,6 @@ // Common attributes -:wireshark-version: 2.4.0rc2 +:wireshark-version: 2.4.0 // // URLs diff --git a/version.conf b/version.conf index f40363f4cf..62f7e410f9 100644 --- a/version.conf +++ b/version.conf @@ -1,13 +1,13 @@ # Interim releases: Enable packaging, add an "rc" to the version. -#enable: 1 -#pkg_format: rc1-%# -#pkg_enable: 1 - -# Release candidates enable: 1 -pkg_format: rc2 +pkg_format: rc3-%# pkg_enable: 1 +# Release candidates +#enable: 1 +#pkg_format: rc3 +#pkg_enable: 1 + # Final release: Disable package version stamps. #enable: 1 #pkg_format: |