Bump version to 1.2.5

12 files changed, 21 insertions, 21 deletions

diff --git a/g15helper/g15helper.plist b/g15helper/g15helper.plist
index d8ea2a3c3..bfb0859ed 100644
--- a/g15helper/g15helper.plist
+++ b/g15helper/g15helper.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleSignature</key>
 	<string>G15H</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.4</string>
+	<string>1.2.5</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright (c) 2009 Mikkel Krautz &lt;mikkel@krautz.dk&gt;</string>
 </dict>
diff --git a/g15helper/g15helper.rc b/g15helper/g15helper.rc
index 858bc0f23..fd192689b 100644
--- a/g15helper/g15helper.rc
+++ b/g15helper/g15helper.rc
@@ -15,8 +15,8 @@ IDI_ICON1               ICON    DISCARDABLE     "..\\icons\\g15helper.ico"
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION		1,2,4,0
-	PRODUCTVERSION	1,2,4,0
+	FILEVERSION		1,2,5,0
+	PRODUCTVERSION	1,2,5,0
 	FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
 	FILEFLAGS		(VER_DEBUG|VER_RELEASE)
 	FILEOS			VOS_NT_WINDOWS32
@@ -29,8 +29,8 @@ VS_VERSION_INFO VERSIONINFO
 			BEGIN
 				VALUE "CompanyName", "Mikkel Krautz"
 				VALUE "FileDescription", "Mumble G15 LCD Helper"
-				VALUE "FileVersion", "1.2.4"
-				VALUE "ProductVersion", "1.2.4"
+				VALUE "FileVersion", "1.2.5"
+				VALUE "ProductVersion", "1.2.5"
 				VALUE "LegalCopyright", "Copyright (C) 2008-2011, Mikkel Krautz <mikkel@krautz.dk>"
 				VALUE "OriginalFilename", "mumble-g15-helper.exe"
 				VALUE "ProductName", "Mumble G15 LCD Helper"
diff --git a/installer/Settings.wxi b/installer/Settings.wxi
index 6b78bbb51..9e253ce1b 100644
--- a/installer/Settings.wxi
+++ b/installer/Settings.wxi
@@ -2,7 +2,7 @@
 <Include>
   <?define ProductName = "Mumble" ?>
   <?define ProductManufacturer = "Thorvald Natvig" ?>
-  <?define ProductVersion = "1.2.4" ?>
+  <?define ProductVersion = "1.2.5" ?>
 
   <!-- Defaults for values that aren't given by environment variables -->
   <?ifndef env.MumbleSourceDir ?>
diff --git a/macx/common.pri b/macx/common.pri
index 033e69c02..7dc6f84a3 100644
--- a/macx/common.pri
+++ b/macx/common.pri
@@ -1,6 +1,6 @@
 # Common OSX overlay settings.
 
-VERSION = 1.2.4
+VERSION = 1.2.5
 
 DEFINES *= VERSION=\\\"$$VERSION\\\"
 
diff --git a/macx/osax/osax.plist b/macx/osax/osax.plist
index 4d14b9c43..600fe1e6c 100644
--- a/macx/osax/osax.plist
+++ b/macx/osax/osax.plist
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>osax</string>
 	<key>CFbundleVersion</key>
-	<string>1.2.4</string>
+	<string>1.2.5</string>
 	<key>CFBundleSignature</key>
 	<string>MUOL</string>
 	<key>CSResourcesFileMapped</key>
diff --git a/overlay/overlay.pro b/overlay/overlay.pro
index 3c25b09e1..46cd8b2fe 100644
--- a/overlay/overlay.pro
+++ b/overlay/overlay.pro
@@ -1,6 +1,6 @@
 include (../compiler.pri)
 
-VERSION = 1.2.4
+VERSION = 1.2.5
 TARGET_EXT = .dll
 TEMPLATE = lib
 CONFIG -= qt
diff --git a/overlay_gl/overlay_gl.pro b/overlay_gl/overlay_gl.pro
index 7690a1462..e1982d6d2 100644
--- a/overlay_gl/overlay_gl.pro
+++ b/overlay_gl/overlay_gl.pro
@@ -5,7 +5,7 @@ TEMPLATE = lib
 CONFIG -= qt
 CONFIG *= debug_and_release
 TARGET = mumble$(TARGET_ADD)
-VERSION = 1.2.4
+VERSION = 1.2.5
 SOURCES = overlay.c
 LIBS *= -lrt -ldl
 QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD)
diff --git a/src/mumble.pri b/src/mumble.pri
index c4d076f2b..e5f033378 100644
--- a/src/mumble.pri
+++ b/src/mumble.pri
@@ -1,6 +1,6 @@
 include(../compiler.pri)
 
-VERSION		= 1.2.4
+VERSION		= 1.2.5
 DIST		= mumble.pri Message.h PacketDataStream.h CryptState.h Timer.h Version.h OSInfo.h SSL.h Mumble.proto
 CONFIG		+= qt thread debug_and_release warn_on
 DEFINES		*= MUMBLE_VERSION_STRING=$$VERSION
diff --git a/src/mumble/mumble.plist b/src/mumble/mumble.plist
index 7c9e01364..cd7aefc91 100644
--- a/src/mumble/mumble.plist
+++ b/src/mumble/mumble.plist
@@ -26,7 +26,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.4</string>
+	<string>1.2.5</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright (c) 2005-2010 Thorvald Natvig &lt;slicer@users.sourceforge.net&gt;</string>
 </dict>
diff --git a/src/mumble/mumble.rc b/src/mumble/mumble.rc
index 6389df7b2..1b0a1acec 100644
--- a/src/mumble/mumble.rc
+++ b/src/mumble/mumble.rc
@@ -15,8 +15,8 @@ IDI_ICON1               ICON    DISCARDABLE     "..\\..\\icons\\mumble.ico"
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION		1,2,4,0
-	PRODUCTVERSION	1,2,4,0
+	FILEVERSION		1,2,5,0
+	PRODUCTVERSION	1,2,5,0
 	FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
 	FILEFLAGS		(VER_DEBUG|VER_RELEASE)
 	FILEOS			VOS_NT_WINDOWS32
@@ -29,8 +29,8 @@ VS_VERSION_INFO VERSIONINFO
 			BEGIN
 				VALUE "CompanyName", "Thorvald Natvig"
 				VALUE "FileDescription", "Mumble - Low-latency VoIP client"
-				VALUE "FileVersion", "1.2.4"
-				VALUE "ProductVersion", "1.2.4"
+				VALUE "FileVersion", "1.2.5"
+				VALUE "ProductVersion", "1.2.5"
 				VALUE "LegalCopyright", "Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>"
 				VALUE "OriginalFilename", "mumble.exe"
 				VALUE "ProductName", "Mumble"
diff --git a/src/murmur/murmur.plist b/src/murmur/murmur.plist
index 8b58a489b..626422b7b 100644
--- a/src/murmur/murmur.plist
+++ b/src/murmur/murmur.plist
@@ -13,7 +13,7 @@
 	<key>CFBundleSignature</key>
 	<string>MMUR</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.4</string>
+	<string>1.2.5</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright (c) 2005-2010 Thorvald Natvig &lt;slicer@users.sourceforge.net&gt;</string>
 </dict>
diff --git a/src/murmur/murmur.rc b/src/murmur/murmur.rc
index b69f27823..46a9781b9 100644
--- a/src/murmur/murmur.rc
+++ b/src/murmur/murmur.rc
@@ -15,8 +15,8 @@ IDI_ICON1               ICON    DISCARDABLE     "..\\..\\icons\\murmur.ico"
 #endif
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION		1,2,4,0
-	PRODUCTVERSION	1,2,4,0
+	FILEVERSION		1,2,5,0
+	PRODUCTVERSION	1,2,5,0
 	FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
 	FILEFLAGS		(VER_DEBUG|VER_RELEASE)
 	FILEOS			VOS_NT_WINDOWS32
@@ -29,8 +29,8 @@ VS_VERSION_INFO VERSIONINFO
 			BEGIN
 				VALUE "CompanyName", "Thorvald Natvig"
 				VALUE "FileDescription", "Murmur - Low-latency VoIP server"
-				VALUE "FileVersion", "1.2.4"
-				VALUE "ProductVersion", "1.2.4"
+				VALUE "FileVersion", "1.2.5"
+				VALUE "ProductVersion", "1.2.5"
 				VALUE "LegalCopyright", "Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>"
 				VALUE "OriginalFilename", "murmur.exe"
 				VALUE "ProductName", "Mumble"