Merge PR #3309: Bump version to 1.2.20.1.2.20

12 files changed, 21 insertions, 21 deletions

diff --git a/g15helper/g15helper.plist b/g15helper/g15helper.plist
index f1358c6cc..e01465857 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.19</string>
+	<string>1.2.20</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 04a411a9a..c98cd31df 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,19,0
-	PRODUCTVERSION	1,2,19,0
+	FILEVERSION		1,2,20,0
+	PRODUCTVERSION	1,2,20,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.19"
-				VALUE "ProductVersion", "1.2.19"
+				VALUE "FileVersion", "1.2.20"
+				VALUE "ProductVersion", "1.2.20"
 				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 786760c85..a3c478e14 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.19" ?>
+  <?define ProductVersion = "1.2.20" ?>
 
   <!-- Defaults for values that aren't given by environment variables -->
   <?ifndef env.MumbleSourceDir ?>
diff --git a/macx/common.pri b/macx/common.pri
index 1daa26c69..ed9c390b0 100644
--- a/macx/common.pri
+++ b/macx/common.pri
@@ -1,6 +1,6 @@
 # Common OSX overlay settings.
 
-VERSION = 1.2.19
+VERSION = 1.2.20
 
 DEFINES *= VERSION=\\\"$$VERSION\\\"
 
diff --git a/macx/osax/osax.plist b/macx/osax/osax.plist
index 726af8af8..ad9adf55c 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.19</string>
+	<string>1.2.20</string>
 	<key>CFBundleSignature</key>
 	<string>MUOL</string>
 	<key>CSResourcesFileMapped</key>
diff --git a/overlay/overlay.pro b/overlay/overlay.pro
index 6b9c0e4b4..7090b3d04 100644
--- a/overlay/overlay.pro
+++ b/overlay/overlay.pro
@@ -1,6 +1,6 @@
 include (../compiler.pri)
 
-VERSION = 1.2.19
+VERSION = 1.2.20
 TARGET_EXT = .dll
 TEMPLATE = lib
 CONFIG -= qt
diff --git a/overlay_gl/overlay_gl.pro b/overlay_gl/overlay_gl.pro
index 1b5ac17bc..ac0b368cd 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.19
+VERSION = 1.2.20
 SOURCES = overlay.c
 LIBS *= -lrt -ldl
 QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD)
diff --git a/src/mumble.pri b/src/mumble.pri
index f05be4737..50c61c16f 100644
--- a/src/mumble.pri
+++ b/src/mumble.pri
@@ -1,6 +1,6 @@
 include(../compiler.pri)
 
-VERSION		= 1.2.19
+VERSION		= 1.2.20
 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 b1dbf4c1a..0cb9ee99a 100644
--- a/src/mumble/mumble.plist
+++ b/src/mumble/mumble.plist
@@ -26,7 +26,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.19</string>
+	<string>1.2.20</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright (c) 2005-2010 Thorvald Natvig &lt;slicer@users.sourceforge.net&gt;</string>
 	<key>NSPrincipalClass</key>
diff --git a/src/mumble/mumble.rc b/src/mumble/mumble.rc
index 352101e97..ccbd5a34e 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,19,0
-	PRODUCTVERSION	1,2,19,0
+	FILEVERSION		1,2,20,0
+	PRODUCTVERSION	1,2,20,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.19"
-				VALUE "ProductVersion", "1.2.19"
+				VALUE "FileVersion", "1.2.20"
+				VALUE "ProductVersion", "1.2.20"
 				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 629774ee9..6adb0b3ed 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.19</string>
+	<string>1.2.20</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 360b35072..01ef66e8b 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,19,0
-	PRODUCTVERSION	1,2,19,0
+	FILEVERSION		1,2,20,0
+	PRODUCTVERSION	1,2,20,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.19"
-				VALUE "ProductVersion", "1.2.19"
+				VALUE "FileVersion", "1.2.20"
+				VALUE "ProductVersion", "1.2.20"
 				VALUE "LegalCopyright", "Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>"
 				VALUE "OriginalFilename", "murmur.exe"
 				VALUE "ProductName", "Mumble"