summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-11-18 16:44:16 +0000
committerGerald Combs <gerald@wireshark.org>2013-11-18 16:44:16 +0000
commit5033435add3d880b188810361fcb6bfaf0fba4b1 (patch)
tree6a72990fa3b1a825aa261c42d4f3cfa3271f931a
parent6188141e3e1721bdec0a7461917cd0db5afd7e54 (diff)
downloadwireshark-5033435add3d880b188810361fcb6bfaf0fba4b1.tar.gz
Build 1.11.2.
svn path=/trunk/; revision=53411
-rw-r--r--docbook/release-notes.asciidoc2
-rwxr-xr-xmake-version.pl8
2 files changed, 5 insertions, 5 deletions
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index c6e2ff2b88..399b35e738 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -26,7 +26,7 @@ The following bugs have been fixed:
The following features are new (or have been significantly updated)
since version 1.11.1:
-* All sorts of amazing things.
+* Mac OS X packaging has been improved.
The following features are new (or have been significantly updated)
since version 1.11.0:
diff --git a/make-version.pl b/make-version.pl
index a2d8e93868..6ab4ab9b1b 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -85,12 +85,12 @@ my %version_pref = (
"is_release" => 0,
# Normal development builds
- "pkg_enable" => 1,
- "pkg_format" => "-SVN-%#",
+ #"pkg_enable" => 1,
+ #"pkg_format" => "-SVN-%#",
# Development releases
- #"pkg_enable" => 0,
- #"pkg_format" => "",
+ "pkg_enable" => 0,
+ "pkg_format" => "",
);
my $srcdir = ".";
my $info_cmd = "";