osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

2.5.1 → 2.5.2. 

Change-Id: I21809524a83ac5bd7c2e42047c82a01a99d04658
Reviewed-on: https://code.wireshark.org/review/26489
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2018-03-15 15:22:56 -07:00
parent b6809353e0
commit dca414ded1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docbook/release-notes.asciidoc
View File

@ -23,9 +23,9 @@ user interface. It will not be supported or available in Wireshark 3.0.
Many user interface improvements have been made. See the “New and Updated Many user interface improvements have been made. See the “New and Updated
Features” section below for more details. Features” section below for more details.
//=== Bug Fixes === Bug Fixes
//The following bugs have been fixed: The following bugs have been fixed:
//* ws_buglink:5000[] //* ws_buglink:5000[]
//* ws_buglink:6000[Wireshark bug] //* ws_buglink:6000[Wireshark bug]

10
make-version.pl
View File

@ -73,7 +73,7 @@ my $set_release = 0;
my %version_pref = ( my %version_pref = (
"version_major" => 2, "version_major" => 2,
"version_minor" => 5, "version_minor" => 5,
"version_micro" => 1, "version_micro" => 2,
"version_build" => 0, "version_build" => 0,
"enable" => 1, "enable" => 1,
@ -83,12 +83,12 @@ my %version_pref = (
"format" => "git %Y%m%d%H%M%S", "format" => "git %Y%m%d%H%M%S",
# Normal development builds # Normal development builds
#"pkg_enable" => 1, "pkg_enable" => 1,
#"pkg_format" => "-%#", "pkg_format" => "-%#",
# Development releases # Development releases
"pkg_enable" => 0, #"pkg_enable" => 0,
"pkg_format" => "", #"pkg_format" => "",
); );
my $srcdir = "."; my $srcdir = ".";
my $info_cmd = ""; my $info_cmd = "";