diff options
-rw-r--r-- | docbook/release-notes.asciidoc | 3 | ||||
-rwxr-xr-x | make-version.pl | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index 8fefb97bd8..9dc5aa45e7 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -24,6 +24,9 @@ used for troubleshooting, analysis, development and education. === New and Updated Features The following features are new (or have been significantly updated) +since version 2.1.1: + +The following features are new (or have been significantly updated) since version 2.1.0: * Added -d option for Decode As support in Wireshark (mimics TShark diff --git a/make-version.pl b/make-version.pl index 0ce9e9bb85..f5c21dd521 100755 --- a/make-version.pl +++ b/make-version.pl @@ -95,12 +95,12 @@ my %version_pref = ( "format" => "git %Y%m%d%H%M%S", # Normal development builds - #"pkg_enable" => 1, - #"pkg_format" => "-%#", + "pkg_enable" => 1, + "pkg_format" => "-%#", # Development releases - "pkg_enable" => 0, - "pkg_format" => "", + #"pkg_enable" => 0, + #"pkg_format" => "", ); my $srcdir = "."; my $info_cmd = ""; |