aboutsummaryrefslogtreecommitdiffstats
path: root/config.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2008-09-04 19:37:16 +0000
committerGerald Combs <gerald@wireshark.org>2008-09-04 19:37:16 +0000
commit56c7f5b643ec1763e6240ce9eef0f7208d8f3464 (patch)
tree5cbd66eaf4c6681a71d250cc8470a1c549391756 /config.nmake
parent5a97fd382fd44d7f6ef35e5ed13c583bc339ddee (diff)
Move the trunk to 1.1.0. Temporarily build a non-SVN-stamped package, so
that we can build 1.1.0 packages. svn path=/trunk/; revision=26136
Diffstat (limited to 'config.nmake')
-rw-r--r--config.nmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/config.nmake b/config.nmake
index ba6fe03f52..151ec2fb33 100644
--- a/config.nmake
+++ b/config.nmake
@@ -15,8 +15,8 @@ PLATFORM=win32
# The current Wireshark version
# It's highly recommended to leave MAJOR/MINOR/MICRO unchanged
VERSION_MAJOR=1
-VERSION_MINOR=0
-VERSION_MICRO=99
+VERSION_MINOR=1
+VERSION_MICRO=0
VERSION_BUILD=0
# It's recommended to change VERSION_EXTRA for your own custom builds
# e.g. "-SVN-12345"