diff options
author | Mikkel Krautz <mikkel@krautz.dk> | 2014-05-14 00:34:42 +0400 |
---|---|---|
committer | Mikkel Krautz <mikkel@krautz.dk> | 2014-05-14 00:34:42 +0400 |
commit | f49185d184e7f417d230636b10109d2d84b7813c (patch) | |
tree | 584671e54b417ebc729a084dd18a2efe85851630 | |
parent | e30d7acda6c04b667618ac86f49786cf966a08fb (diff) |
Bump version to 1.2.6
-rw-r--r-- | g15helper/g15helper.plist | 2 | ||||
-rw-r--r-- | g15helper/g15helper.rc | 8 | ||||
-rw-r--r-- | installer/Settings.wxi | 2 | ||||
-rw-r--r-- | macx/common.pri | 2 | ||||
-rw-r--r-- | macx/osax/osax.plist | 2 | ||||
-rw-r--r-- | overlay/overlay.pro | 2 | ||||
-rw-r--r-- | overlay_gl/overlay_gl.pro | 2 | ||||
-rw-r--r-- | src/mumble.pri | 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 |
12 files changed, 21 insertions, 21 deletions
diff --git a/g15helper/g15helper.plist b/g15helper/g15helper.plist index bfb0859ed..d7dfbda8e 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.5</string> + <string>1.2.6</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 fd192689b..51c77ea02 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,5,0 - PRODUCTVERSION 1,2,5,0 + FILEVERSION 1,2,6,0 + PRODUCTVERSION 1,2,6,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.5" - VALUE "ProductVersion", "1.2.5" + VALUE "FileVersion", "1.2.6" + VALUE "ProductVersion", "1.2.6" 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 9e253ce1b..cf19b2aaa 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.5" ?> + <?define ProductVersion = "1.2.6" ?> <!-- Defaults for values that aren't given by environment variables --> <?ifndef env.MumbleSourceDir ?> diff --git a/macx/common.pri b/macx/common.pri index 7dc6f84a3..3ab14c883 100644 --- a/macx/common.pri +++ b/macx/common.pri @@ -1,6 +1,6 @@ # Common OSX overlay settings. -VERSION = 1.2.5 +VERSION = 1.2.6 DEFINES *= VERSION=\\\"$$VERSION\\\" diff --git a/macx/osax/osax.plist b/macx/osax/osax.plist index 600fe1e6c..b46f54848 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.5</string> + <string>1.2.6</string> <key>CFBundleSignature</key> <string>MUOL</string> <key>CSResourcesFileMapped</key> diff --git a/overlay/overlay.pro b/overlay/overlay.pro index 46cd8b2fe..377724a08 100644 --- a/overlay/overlay.pro +++ b/overlay/overlay.pro @@ -1,6 +1,6 @@ include (../compiler.pri) -VERSION = 1.2.5 +VERSION = 1.2.6 TARGET_EXT = .dll TEMPLATE = lib CONFIG -= qt diff --git a/overlay_gl/overlay_gl.pro b/overlay_gl/overlay_gl.pro index e1982d6d2..57627c50e 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.5 +VERSION = 1.2.6 SOURCES = overlay.c LIBS *= -lrt -ldl QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD) diff --git a/src/mumble.pri b/src/mumble.pri index e5f033378..b164d4ab9 100644 --- a/src/mumble.pri +++ b/src/mumble.pri @@ -1,6 +1,6 @@ include(../compiler.pri) -VERSION = 1.2.5 +VERSION = 1.2.6 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 cd7aefc91..ceecb8a22 100644 --- a/src/mumble/mumble.plist +++ b/src/mumble/mumble.plist @@ -26,7 +26,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>1.2.5</string> + <string>1.2.6</string> <key>NSHumanReadableCopyright</key> <string>Copyright (c) 2005-2010 Thorvald Natvig <slicer@users.sourceforge.net></string> </dict> diff --git a/src/mumble/mumble.rc b/src/mumble/mumble.rc index 1b0a1acec..5e8679c34 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,5,0 - PRODUCTVERSION 1,2,5,0 + FILEVERSION 1,2,6,0 + PRODUCTVERSION 1,2,6,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.5" - VALUE "ProductVersion", "1.2.5" + VALUE "FileVersion", "1.2.6" + VALUE "ProductVersion", "1.2.6" 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 626422b7b..f56a1b7a6 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.5</string> + <string>1.2.6</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 46a9781b9..05dd66f6a 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,5,0 - PRODUCTVERSION 1,2,5,0 + FILEVERSION 1,2,6,0 + PRODUCTVERSION 1,2,6,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.5" - VALUE "ProductVersion", "1.2.5" + VALUE "FileVersion", "1.2.6" + VALUE "ProductVersion", "1.2.6" VALUE "LegalCopyright", "Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>" VALUE "OriginalFilename", "murmur.exe" VALUE "ProductName", "Mumble" |