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:
authorJan Klass <kissaki@posteo.de>2019-09-22 12:37:14 +0300
committerGitHub <noreply@github.com>2019-09-22 12:37:14 +0300
commit413951ce0c58a54aff652412dac1cb5496477691 (patch)
tree4e58bfde2bd0a9f309feb6399631a1fc2d1b8ec5
parent9318027ec9c2139fc0779b8cd7f2b93152475a89 (diff)
parent19b57021683144590f46dc4b6b59076740e6b360 (diff)
Merge PR #3799: Bump version to 1.4.0
1.3.0 has been released. master now represents the current state of development towards the next feature release 1.4.0. Bugfixes for 1.3 will happen in the 1.3.x branch. Compared to earlier version bumps we bump a lot more files because of we produce more artifacts; overlay process, dll and exe split, etc. This should have happened right after the 1.3.x branch was split off. Fixes #3761 Waiting on response from xPoke in that ticket concerning theme version. That will have to be landed first, and then this PR updated with the landed commit in mumble-theme. Feel free to already review independent of xPoke response. As the mumble-theme commit did not land yet checking out this PR will not work (for others than me who has the commit locally).
Diffstat
-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/mumble_ol.rc8
-rw-r--r--overlay/overlay-shared.pro2
-rw-r--r--overlay/overlay_exe/overlay_exe.rc8
-rw-r--r--overlay_gl/overlay_gl.pro2
-rw-r--r--overlay_winx64/mumble_ol.rc8
-rw-r--r--overlay_winx64/overlay_exe_winx64/overlay_exe.rc8
-rw-r--r--src/mumble.pri2
-rw-r--r--src/mumble/mumble.plist2
-rw-r--r--src/mumble/mumble.rc8
-rwxr-xr-xsrc/mumble/mumble_dll.rc8
-rw-r--r--src/murmur/murmur.plist2
-rw-r--r--src/murmur/murmur.rc8
m---------themes/Mumble0
18 files changed, 41 insertions, 41 deletions
diff --git a/g15helper/g15helper.plist b/g15helper/g15helper.plist
index 74937fbe4..d29bb5856 100644
--- a/g15helper/g15helper.plist
+++ b/g15helper/g15helper.plist
@@ -13,7 +13,7 @@
<key>CFBundleSignature</key>
<string>G15H</string>
<key>CFBundleVersion</key>
- <string>1.3.0</string>
+ <string>1.4.0</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (c) 2005-2019 The Mumble Developers</string>
</dict>
diff --git a/g15helper/g15helper.rc b/g15helper/g15helper.rc
index 3b12857b2..ab966b758 100644
--- a/g15helper/g15helper.rc
+++ b/g15helper/g15helper.rc
@@ -20,8 +20,8 @@ IDI_ICON1 ICON DISCARDABLE "../icons/g15helper.ico"
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,4,0,0
+ PRODUCTVERSION 1,4,0,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS (VER_DEBUG|VER_RELEASE)
FILEOS VOS_NT_WINDOWS32
@@ -34,8 +34,8 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "The Mumble Developers"
VALUE "FileDescription", "Mumble G15 LCD Helper"
- VALUE "FileVersion", "1.3.0"
- VALUE "ProductVersion", "1.3.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "ProductVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers"
VALUE "OriginalFilename", "mumble-g15-helper.exe"
VALUE "ProductName", "Mumble G15 LCD Helper"
diff --git a/installer/Settings.wxi b/installer/Settings.wxi
index 2f7e526c0..85158c15a 100644
--- a/installer/Settings.wxi
+++ b/installer/Settings.wxi
@@ -2,7 +2,7 @@
<Include>
<?define ProductName = "Mumble" ?>
<?define ProductManufacturer = "The Mumble Developers" ?>
- <?define ProductVersion = "1.3.0" ?>
+ <?define ProductVersion = "1.4.0" ?>
<?if $(sys.BUILDARCH) = "x86" ?>
<?define ProductUpgradeCode = "B0EEFCC7-8A9c-4471-AB10-CBD35BE3161D" ?>
diff --git a/macx/common.pri b/macx/common.pri
index 05f68ef9a..5f26e5de8 100644
--- a/macx/common.pri
+++ b/macx/common.pri
@@ -5,7 +5,7 @@
# Common OSX overlay settings.
-VERSION = 1.3.0
+VERSION = 1.4.0
DEFINES *= VERSION=\\\"$$VERSION\\\"
diff --git a/macx/osax/osax.plist b/macx/osax/osax.plist
index d141e6b05..99f81ef20 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.3.0</string>
+ <string>1.4.0</string>
<key>CFBundleSignature</key>
<string>MUOL</string>
<key>CSResourcesFileMapped</key>
diff --git a/overlay/mumble_ol.rc b/overlay/mumble_ol.rc
index 8cd8e641c..cf71f0472 100644
--- a/overlay/mumble_ol.rc
+++ b/overlay/mumble_ol.rc
@@ -18,8 +18,8 @@
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,4,0,0
+ PRODUCTVERSION 1,4,0,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS (VER_DEBUG|VER_RELEASE)
FILEOS VOS_NT_WINDOWS32
@@ -32,8 +32,8 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "The Mumble Developers"
VALUE "FileDescription", "Mumble - Low-latency VoIP client"
- VALUE "FileVersion", "1.3.0"
- VALUE "ProductVersion", "1.3.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "ProductVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers"
VALUE "OriginalFilename", "mumble_ol.dll"
VALUE "ProductName", "Mumble"
diff --git a/overlay/overlay-shared.pro b/overlay/overlay-shared.pro
index 084fa97f3..3f5f30895 100644
--- a/overlay/overlay-shared.pro
+++ b/overlay/overlay-shared.pro
@@ -5,7 +5,7 @@
include (../qmake/compiler.pri)
-VERSION = 1.3.0
+VERSION = 1.4.0
TARGET_EXT = .dll
TEMPLATE = lib
CONFIG -= qt
diff --git a/overlay/overlay_exe/overlay_exe.rc b/overlay/overlay_exe/overlay_exe.rc
index d62e1b7fa..42a83d4c9 100644
--- a/overlay/overlay_exe/overlay_exe.rc
+++ b/overlay/overlay_exe/overlay_exe.rc
@@ -18,8 +18,8 @@
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,4,0,0
+ PRODUCTVERSION 1,4,0,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS (VER_DEBUG|VER_RELEASE)
FILEOS VOS_NT_WINDOWS32
@@ -32,8 +32,8 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "The Mumble Developers"
VALUE "FileDescription", "Mumble - Low-latency VoIP client"
- VALUE "FileVersion", "1.3.0"
- VALUE "ProductVersion", "1.3.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "ProductVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers"
VALUE "OriginalFilename", "mumble_ol_helper.exe"
VALUE "ProductName", "Mumble"
diff --git a/overlay_gl/overlay_gl.pro b/overlay_gl/overlay_gl.pro
index 0cf0800a9..e678802ed 100644
--- a/overlay_gl/overlay_gl.pro
+++ b/overlay_gl/overlay_gl.pro
@@ -10,7 +10,7 @@ include(../qmake/compiler.pri)
TEMPLATE = lib
CONFIG -= qt gui
CONFIG *= debug_and_release
-VERSION = 1.3.0
+VERSION = 1.4.0
SOURCES = overlay.c
CONFIG(static) {
diff --git a/overlay_winx64/mumble_ol.rc b/overlay_winx64/mumble_ol.rc
index 55eb4927e..ea3d5f7d1 100644
--- a/overlay_winx64/mumble_ol.rc
+++ b/overlay_winx64/mumble_ol.rc
@@ -18,8 +18,8 @@
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,4,0,0
+ PRODUCTVERSION 1,4,0,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS (VER_DEBUG|VER_RELEASE)
FILEOS VOS_NT_WINDOWS32
@@ -32,8 +32,8 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "The Mumble Developers"
VALUE "FileDescription", "Mumble - Low-latency VoIP client"
- VALUE "FileVersion", "1.3.0"
- VALUE "ProductVersion", "1.3.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "ProductVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers"
VALUE "OriginalFilename", "mumble_ol_x64.dll"
VALUE "ProductName", "Mumble"
diff --git a/overlay_winx64/overlay_exe_winx64/overlay_exe.rc b/overlay_winx64/overlay_exe_winx64/overlay_exe.rc
index ceb413497..7ca53f5b3 100644
--- a/overlay_winx64/overlay_exe_winx64/overlay_exe.rc
+++ b/overlay_winx64/overlay_exe_winx64/overlay_exe.rc
@@ -18,8 +18,8 @@
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,4,0,0
+ PRODUCTVERSION 1,4,0,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS (VER_DEBUG|VER_RELEASE)
FILEOS VOS_NT_WINDOWS32
@@ -32,8 +32,8 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "The Mumble Developers"
VALUE "FileDescription", "Mumble - Low-latency VoIP client"
- VALUE "FileVersion", "1.3.0"
- VALUE "ProductVersion", "1.3.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "ProductVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers"
VALUE "OriginalFilename", "mumble_ol_helper_x64.exe"
VALUE "ProductName", "Mumble"
diff --git a/src/mumble.pri b/src/mumble.pri
index 205e5c280..878e590b9 100644
--- a/src/mumble.pri
+++ b/src/mumble.pri
@@ -8,7 +8,7 @@ include(../qmake/qt.pri)
include(../qmake/rcc.pri)
include(../qmake/pkgconfig.pri)
-VERSION = 1.3.0
+VERSION = 1.4.0
DIST = mumble.pri Message.h PacketDataStream.h CryptState.h Timer.h Version.h OSInfo.h SSL.h
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 930cfd0ab..fbf8696be 100644
--- a/src/mumble/mumble.plist
+++ b/src/mumble/mumble.plist
@@ -26,7 +26,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.3.0</string>
+ <string>1.4.0</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (c) 2005-2019 The Mumble Developers</string>
<key>NSPrincipalClass</key>
diff --git a/src/mumble/mumble.rc b/src/mumble/mumble.rc
index 77104910d..95e25ee40 100644
--- a/src/mumble/mumble.rc
+++ b/src/mumble/mumble.rc
@@ -20,8 +20,8 @@ IDI_ICON1 ICON DISCARDABLE "../../icons/mumble.ico"
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,4,0,0
+ PRODUCTVERSION 1,4,0,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS (VER_DEBUG|VER_RELEASE)
FILEOS VOS_NT_WINDOWS32
@@ -34,8 +34,8 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "The Mumble Developers"
VALUE "FileDescription", "Mumble - Low-latency VoIP client"
- VALUE "FileVersion", "1.3.0"
- VALUE "ProductVersion", "1.3.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "ProductVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers"
VALUE "OriginalFilename", "mumble.exe"
VALUE "ProductName", "Mumble"
diff --git a/src/mumble/mumble_dll.rc b/src/mumble/mumble_dll.rc
index a8d555de0..0338ecb99 100755
--- a/src/mumble/mumble_dll.rc
+++ b/src/mumble/mumble_dll.rc
@@ -18,8 +18,8 @@
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,4,0,0
+ PRODUCTVERSION 1,4,0,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS (VER_DEBUG|VER_RELEASE)
FILEOS VOS_NT_WINDOWS32
@@ -32,8 +32,8 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "The Mumble Developers"
VALUE "FileDescription", "Mumble - Low-latency VoIP client"
- VALUE "FileVersion", "1.3.0"
- VALUE "ProductVersion", "1.3.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "ProductVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers"
VALUE "OriginalFilename", "mumble_app.dll"
VALUE "ProductName", "Mumble"
diff --git a/src/murmur/murmur.plist b/src/murmur/murmur.plist
index d2832b54e..70101d480 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.3.0</string>
+ <string>1.4.0</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (c) 2005-2019 The Mumble Developers</string>
</dict>
diff --git a/src/murmur/murmur.rc b/src/murmur/murmur.rc
index aeef34e73..473863575 100644
--- a/src/murmur/murmur.rc
+++ b/src/murmur/murmur.rc
@@ -20,8 +20,8 @@ IDI_ICON1 ICON DISCARDABLE "../../icons/murmur.ico"
#endif
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
+ FILEVERSION 1,4,0,0
+ PRODUCTVERSION 1,4,0,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS (VER_DEBUG|VER_RELEASE)
FILEOS VOS_NT_WINDOWS32
@@ -34,8 +34,8 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "The Mumble Developers"
VALUE "FileDescription", "Murmur - Low-latency VoIP server"
- VALUE "FileVersion", "1.3.0"
- VALUE "ProductVersion", "1.3.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "ProductVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (c) 2005-2019 The Mumble Developers"
VALUE "OriginalFilename", "murmur.exe"
VALUE "ProductName", "Mumble"
diff --git a/themes/Mumble b/themes/Mumble
-Subproject 1d48b123d2e62dab348e08810787e41a7511be6
+Subproject 9c68c1453837b82f69e93d7df2dbdd086d96f27
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 14:40:23 +0300