Skip to content

Commit

Permalink
Merge release 4.6.2 improvements into development (Mudlet#3501)
Browse files Browse the repository at this point in the history
* MCMP Bug Fix: key (Mudlet#3478)

* Client.Media to Client.Media.Default

* MCMP Bug Fix: key

Co-authored-by: Vadim Peretokin <vperetokin@gmail.com>
(cherry picked from commit e970751)

* 4.6.2 bugfix release

Co-authored-by: Mike Conley <sousesider@gmail.com>
  • Loading branch information
vadi2 and mpconley authored Mar 22, 2020
1 parent d9ecc44 commit 05c95cb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ endif()
# To insure consistency please ensure the SAME of the first two values are also
# assigned to the "VERSION" and "BUILD" variables in the native qmake project
# file, which is NOW called: ./src/mudlet.pro
set(APP_VERSION 4.6.1)
set(APP_VERSION 4.6.2)
if(DEFINED ENV{MUDLET_VERSION_BUILD} AND NOT $ENV{MUDLET_VERSION_BUILD} STREQUAL "")
set(APP_BUILD $ENV{MUDLET_VERSION_BUILD})
else()
Expand Down
2 changes: 1 addition & 1 deletion src/mudlet.pro
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ TEMPLATE = app
########################## Version and Build setting ###########################
# Set the current Mudlet Version, unfortunately the Qt documentation suggests
# that only a #.#.# form without any other alphanumberic suffixes is required:
VERSION = 4.6.1
VERSION = 4.6.2

# if you are distributing modified code, it would be useful if you
# put something distinguishing into the MUDLET_VERSION_BUILD environment
Expand Down

0 comments on commit 05c95cb

Please sign in to comment.