diff options
| author | Thorvald Natvig <slicer@users.sourceforge.net> | 2010-01-10 20:12:09 +0300 |
|---|---|---|
| committer | Thorvald Natvig <slicer@users.sourceforge.net> | 2010-01-10 20:12:18 +0300 |
| commit | 3a2280f9d3e839f5fee3c89d938a5d29c12cf43d (patch) | |
| tree | 3b01a2e5a59b2ab7a28d880e15650286b1f3a033 /src | |
| parent | 360085fdf314626513ccd80d5af8dbe92da91118 (diff) | |
Bump version to 1.2.2
Diffstat (limited to 'src')
| -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 |
6 files changed, 12 insertions, 12 deletions
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" |