diff options
-rw-r--r-- | g15helper/g15helper.plist | 2 | ||||
-rw-r--r-- | g15helper/g15helper.rc | 8 | ||||
-rw-r--r-- | installer/Mumble.nsi | 4 | ||||
-rw-r--r-- | installer_macx/MumbleInstaller.pmdoc/01mumble.xml | 2 | ||||
-rw-r--r-- | overlay_gl/overlay_gl.pro | 2 | ||||
-rw-r--r-- | overlay_macx/common.pri | 2 | ||||
-rw-r--r-- | overlay_macx/launcher/launcher.plist | 2 | ||||
-rw-r--r-- | src/mumble.pri | 2 | ||||
-rw-r--r-- | src/mumble/MainWindow.cpp | 2 | ||||
-rw-r--r-- | src/mumble/mumble.plist | 2 | ||||
-rw-r--r-- | src/mumble/mumble.rc | 8 | ||||
-rw-r--r-- | src/murmur/murmur.plist | 2 | ||||
-rw-r--r-- | src/murmur/murmur.rc | 8 |
13 files changed, 23 insertions, 23 deletions
diff --git a/g15helper/g15helper.plist b/g15helper/g15helper.plist index 0a3b3f31f..3b9090fc8 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.1</string> + <string>1.2.2</string> <key>NSHumanReadableCopyright</key> <string>Copyright (c) 2009 Mikkel Krautz <mikkel@krautz.dk></string> </dict> diff --git a/g15helper/g15helper.rc b/g15helper/g15helper.rc index 03a403420..c15b57e53 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,1,0 - PRODUCTVERSION 1,2,1,0 + FILEVERSION 1,2,2,0 + PRODUCTVERSION 1,2,2,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.1" - VALUE "ProductVersion", "1.2.1" + VALUE "FileVersion", "1.2.2" + VALUE "ProductVersion", "1.2.2" VALUE "LegalCopyright", "Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk>" VALUE "OriginalFilename", "mumble-g15-helper.exe" VALUE "ProductName", "Mumble G15 LCD Helper" diff --git a/installer/Mumble.nsi b/installer/Mumble.nsi index 0fecb1984..db64001c8 100644 --- a/installer/Mumble.nsi +++ b/installer/Mumble.nsi @@ -195,11 +195,11 @@ Section "" SectionCommon WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mumble" \ "Publisher" "Mumble" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mumble" \ - "InstallSource" "http://prdownloads.sourceforge.net/mumble/Mumble-1.2.1.exe?download" + "InstallSource" "http://prdownloads.sourceforge.net/mumble/Mumble-1.2.2.exe?download" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mumble" \ "URLInfoAbout" "http://mumble.sourceforge.net/" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mumble" \ - "DisplayVersion" "1.2.1" + "DisplayVersion" "1.2.2" WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mumble" \ "NoModify" 1 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Mumble" \ diff --git a/installer_macx/MumbleInstaller.pmdoc/01mumble.xml b/installer_macx/MumbleInstaller.pmdoc/01mumble.xml index ef2613bc4..d2dee6b6c 100644 --- a/installer_macx/MumbleInstaller.pmdoc/01mumble.xml +++ b/installer_macx/MumbleInstaller.pmdoc/01mumble.xml @@ -1,7 +1,7 @@ <pkgref spec="1.12" uuid="6AB1E063-9961-4D61-A451-60139AFE7955"> <config> <identifier>net.sourceforge.mumble.base</identifier> - <version>1.2.1</version> + <version>1.2.2</version> <description></description> <post-install type="none" /> <requireAuthorization /> diff --git a/overlay_gl/overlay_gl.pro b/overlay_gl/overlay_gl.pro index d3c78d091..eddb2136f 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.1 +VERSION = 1.2.2 SOURCES = overlay.c LIBS *= -lrt -ldl QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD) diff --git a/overlay_macx/common.pri b/overlay_macx/common.pri index 1f4f59f54..5bf6c40ec 100644 --- a/overlay_macx/common.pri +++ b/overlay_macx/common.pri @@ -1,6 +1,6 @@ # Common OSX overlay settings. -VERSION = 1.2.1 +VERSION = 1.2.2 DEFINES *= VERSION=\\\"$$VERSION\\\" diff --git a/overlay_macx/launcher/launcher.plist b/overlay_macx/launcher/launcher.plist index d76f770e7..2c4bdbf76 100644 --- a/overlay_macx/launcher/launcher.plist +++ b/overlay_macx/launcher/launcher.plist @@ -13,7 +13,7 @@ <key>CFBundleSignature</key> <string>LAUN</string> <key>CFBundleVersion</key> - <string>1.2.1</string> + <string>1.2.2</string> <key>NSHumanReadableCopyright</key> <string>Copyright (c) 2009 Mikkel Krautz <mikkel@krautz.dk></string> </dict> diff --git a/src/mumble.pri b/src/mumble.pri index 800cfe35e..a4e296eda 100644 --- a/src/mumble.pri +++ b/src/mumble.pri @@ -1,6 +1,6 @@ include(../compiler.pri) -VERSION = 1.2.1 +VERSION = 1.2.2 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/MainWindow.cpp b/src/mumble/MainWindow.cpp index 26f2d44af..61fb2b88b 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -540,7 +540,7 @@ void MainWindow::openUrl(const QUrl &url) { return; } else #endif - if ((major != 1) || (minor != 2) || (patch > 1)) { + if ((major != 1) || (minor != 2) || (patch > 2)) { g.l->log(Log::Warning, tr("This version of Mumble can't handle URLs for Mumble version %1.%2.%3").arg(major).arg(minor).arg(patch)); return; } diff --git a/src/mumble/mumble.plist b/src/mumble/mumble.plist index 162f0124b..b5a0e8a31 100644 --- a/src/mumble/mumble.plist +++ b/src/mumble/mumble.plist @@ -26,7 +26,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>1.2.1</string> + <string>1.2.2</string> <key>NSHumanReadableCopyright</key> <string>Copyright (c) 2005-2010 Thorvald Natvig <slicer@users.sourceforge.net></string> <key>MumbleOverlayLibrary</key> diff --git a/src/mumble/mumble.rc b/src/mumble/mumble.rc index 938550324..0bab96a17 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,1,0 - PRODUCTVERSION 1,2,1,0 + FILEVERSION 1,2,2,0 + PRODUCTVERSION 1,2,2,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.1" - VALUE "ProductVersion", "1.2.1" + VALUE "FileVersion", "1.2.2" + VALUE "ProductVersion", "1.2.2" VALUE "LegalCopyright", "Copyright (C) 2005-2010, 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 8029b4b92..e709e1c7b 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.1</string> + <string>1.2.2</string> <key>NSHumanReadableCopyright</key> <string>Copyright (c) 2005-2010 Thorvald Natvig <slicer@users.sourceforge.net></string> </dict> diff --git a/src/murmur/murmur.rc b/src/murmur/murmur.rc index 1b166906f..8d3753876 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,1,0 - PRODUCTVERSION 1,2,1,0 + FILEVERSION 1,2,2,0 + PRODUCTVERSION 1,2,2,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.1" - VALUE "ProductVersion", "1.2.1" + VALUE "FileVersion", "1.2.2" + VALUE "ProductVersion", "1.2.2" VALUE "LegalCopyright", "Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>" VALUE "OriginalFilename", "murmur.exe" VALUE "ProductName", "Mumble" |