diff options
| author | Gerald Combs <gerald@wireshark.org> | 2010-06-07 16:43:09 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2010-06-07 16:43:09 +0000 |
| commit | 349fac664b56dba87832285ff4b889f74fde7192 (patch) | |
| tree | 6c8719c5d6ec02d488a492c5bde9db0b52e07aec | |
| parent | b4410bc9170fa6513c3cfcdf542fa9898962f69b (diff) | |
| download | wireshark-349fac664b56dba87832285ff4b889f74fde7192.tar.gz wireshark-349fac664b56dba87832285ff4b889f74fde7192.tar.bz2 wireshark-349fac664b56dba87832285ff4b889f74fde7192.zip | |
1.3.6 -> 1.5.0
svn path=/trunk/; revision=33138
| -rw-r--r-- | config.nmake | 4 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | docbook/release-notes.xml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/config.nmake b/config.nmake index 8e7cea3b9e..6338ef3d52 100644 --- a/config.nmake +++ b/config.nmake @@ -15,8 +15,8 @@ WIRESHARK_TARGET_PLATFORM=win32 # The current Wireshark version # It's highly recommended to leave MAJOR/MINOR/MICRO unchanged VERSION_MAJOR=1 -VERSION_MINOR=3 -VERSION_MICRO=6 +VERSION_MINOR=5 +VERSION_MICRO=0 VERSION_BUILD=0 # It's recommended to change VERSION_EXTRA for your own custom builds # e.g. "-SVN-12345" diff --git a/configure.in b/configure.in index 73267b3582..b1aada0b4a 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ # AC_PREREQ(2.60) -AC_INIT(wireshark, 1.3.6) +AC_INIT(wireshark, 1.5.0) dnl Check for CPU / vendor / OS dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or diff --git a/debian/changelog b/debian/changelog index 0412385650..b56090bc20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (1.3.6) unstable; urgency=low +wireshark (1.5.0) unstable; urgency=low * Self-made package diff --git a/docbook/release-notes.xml b/docbook/release-notes.xml index ccba280ecd..2bd2a54f8e 100644 --- a/docbook/release-notes.xml +++ b/docbook/release-notes.xml @@ -12,7 +12,7 @@ DOCUMENT SECTION <!-- Wireshark Info --> - <!ENTITY WiresharkCurrentVersion "1.3.6"> + <!ENTITY WiresharkCurrentVersion "1.5.0"> ]> |