Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump version to 1.4.0 #3799

Merged
merged 1 commit into from
Sep 22, 2019
Merged

Bump version to 1.4.0 #3799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion g15helper/g15helper.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions g15helper/g15helper.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion installer/Settings.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ?>
Expand Down
2 changes: 1 addition & 1 deletion macx/common.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# Common OSX overlay settings.

VERSION = 1.3.0
VERSION = 1.4.0

DEFINES *= VERSION=\\\"$$VERSION\\\"

2 changes: 1 addition & 1 deletion macx/osax/osax.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions overlay/mumble_ol.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion overlay/overlay-shared.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

include (../qmake/compiler.pri)

VERSION = 1.3.0
VERSION = 1.4.0
TARGET_EXT = .dll
TEMPLATE = lib
CONFIG -= qt
Expand Down
8 changes: 4 additions & 4 deletions overlay/overlay_exe/overlay_exe.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion overlay_gl/overlay_gl.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions overlay_winx64/mumble_ol.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions overlay_winx64/overlay_exe_winx64/overlay_exe.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/mumble.pri
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/mumble/mumble.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/mumble/mumble.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions src/mumble/mumble_dll.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/murmur/murmur.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions src/murmur/murmur.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion themes/Mumble
Open in desktop
Submodule Mumble updated 4 files
+15 −11 README.md
+ − mumble.icns
+1 −1 overlay.mumblelay
+2 −1 source/Imports/Base Theme.scss