Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2015-07-09 13:33:33 +0300
committerMikkel Krautz <mikkel@krautz.dk>2015-07-09 13:33:33 +0300
commit18cbd4650d5bbc99d8dc43d0efc07e71855771c8 (patch)
treeff9cc1a17e4c7c94bdf6e443978f145c67ae7ffe
parentdb60193c15a6a98bfd8faa92de9b7ea5f6b14798 (diff)
Bump version to 1.2.10.
-rw-r--r--g15helper/g15helper.plist2
-rw-r--r--g15helper/g15helper.rc8
-rw-r--r--installer/Settings.wxi2
-rw-r--r--macx/common.pri2
-rw-r--r--macx/osax/osax.plist2
-rw-r--r--overlay/overlay.pro2
-rw-r--r--overlay_gl/overlay_gl.pro2
-rw-r--r--src/mumble.pri2
-rw-r--r--src/mumble/mumble.plist2
-rw-r--r--src/mumble/mumble.rc8
-rw-r--r--src/murmur/murmur.plist2
-rw-r--r--src/murmur/murmur.rc8
12 files changed, 21 insertions, 21 deletions
diff --git a/g15helper/g15helper.plist b/g15helper/g15helper.plist
index 52447b79c..085874010 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.9</string>
+ <string>1.2.10</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 02646e628..ef76f3e30 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,9,0
- PRODUCTVERSION 1,2,9,0
+ FILEVERSION 1,2,10,0
+ PRODUCTVERSION 1,2,10,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.9"
- VALUE "ProductVersion", "1.2.9"
+ VALUE "FileVersion", "1.2.10"
+ VALUE "ProductVersion", "1.2.10"
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 508cbc36c..6fac47a54 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.9" ?>
+ <?define ProductVersion = "1.2.10" ?>
<!-- Defaults for values that aren't given by environment variables -->
<?ifndef env.MumbleSourceDir ?>
diff --git a/macx/common.pri b/macx/common.pri
index 4ff4fb8c4..be75abf53 100644
--- a/macx/common.pri
+++ b/macx/common.pri
@@ -1,6 +1,6 @@
# Common OSX overlay settings.
-VERSION = 1.2.9
+VERSION = 1.2.10
DEFINES *= VERSION=\\\"$$VERSION\\\"
diff --git a/macx/osax/osax.plist b/macx/osax/osax.plist
index 0594a9b6f..4eb83d048 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.9</string>
+ <string>1.2.10</string>
<key>CFBundleSignature</key>
<string>MUOL</string>
<key>CSResourcesFileMapped</key>
diff --git a/overlay/overlay.pro b/overlay/overlay.pro
index e2c27e02e..d2b17248b 100644
--- a/overlay/overlay.pro
+++ b/overlay/overlay.pro
@@ -1,6 +1,6 @@
include (../compiler.pri)
-VERSION = 1.2.9
+VERSION = 1.2.10
TARGET_EXT = .dll
TEMPLATE = lib
CONFIG -= qt
diff --git a/overlay_gl/overlay_gl.pro b/overlay_gl/overlay_gl.pro
index 2d222f6b1..f85c828c5 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.9
+VERSION = 1.2.10
SOURCES = overlay.c
LIBS *= -lrt -ldl
QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD)
diff --git a/src/mumble.pri b/src/mumble.pri
index cf555b3e3..d4b55640b 100644
--- a/src/mumble.pri
+++ b/src/mumble.pri
@@ -1,6 +1,6 @@
include(../compiler.pri)
-VERSION = 1.2.9
+VERSION = 1.2.10
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 ab2c741bb..eaba06962 100644
--- a/src/mumble/mumble.plist
+++ b/src/mumble/mumble.plist
@@ -26,7 +26,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.2.9</string>
+ <string>1.2.10</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 f101e31f8..bb1db9034 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,9,0
- PRODUCTVERSION 1,2,9,0
+ FILEVERSION 1,2,10,0
+ PRODUCTVERSION 1,2,10,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.9"
- VALUE "ProductVersion", "1.2.9"
+ VALUE "FileVersion", "1.2.10"
+ VALUE "ProductVersion", "1.2.10"
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 33c91c24a..f5e6d77c1 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.9</string>
+ <string>1.2.10</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 020be80c7..74971fcd3 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,9,0
- PRODUCTVERSION 1,2,9,0
+ FILEVERSION 1,2,10,0
+ PRODUCTVERSION 1,2,10,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.9"
- VALUE "ProductVersion", "1.2.9"
+ VALUE "FileVersion", "1.2.10"
+ VALUE "ProductVersion", "1.2.10"
VALUE "LegalCopyright", "Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>"
VALUE "OriginalFilename", "murmur.exe"
VALUE "ProductName", "Mumble"