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

gitlab.com/Remmina/Remmina.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntenore Gatta <antenore@simbiosi.org>2018-07-31 15:12:59 +0300
committerAntenore Gatta <antenore@simbiosi.org>2018-07-31 15:12:59 +0300
commit3dc81eb905547caacffc5e6c2fb06a76dae83ab3 (patch)
tree0aa4c7d650fc7b9e80e7e994373a233fc50dfe86
parent494ad56206916396f017d77d42bb435deee54111 (diff)
parenta4ba0da28b8629ccdde21dfe4b9ff1177263801b (diff)
Merge branch 'v1.2.31.1' into 'master'v1.2.31.1
v1.2.31.1 - Bugfixing release. Closes #1696 and #1700 See merge request Remmina/Remmina!1690
-rw-r--r--CHANGELOG.md15
-rw-r--r--CMakeLists.txt4
2 files changed, 17 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb57404de..3ed02de15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
# Changelog
+## [v1.2.31.1](https://gitlab.com/Remmina/Remmina/tags/v1.2.31.1) (2018-07-31)
+
+This is a bug fixing release.
+
+**Fixed bugs:**
+
+- Cannot minimize in fullscreen mode.
+- Crash with the RDP plugin.
+- Missing manual pages for Debian.
+
+**Closed issues:**
+
+- Minimize window doesn't minimize the window [\#1696](https://gitlab.com/Remmina/Remmina/issues/1696)
+- Minimize window button is disable, after connecting to RDS [\#1700](https://gitlab.com/Remmina/Remmina/issues/1700)
+
## [v1.2.31](https://gitlab.com/Remmina/Remmina/tags/v1.2.31) (2018-07-28)
This is the first release on GitLab and we are still moving and adapting tools and
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbb29a584..129eb6663 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,8 +99,8 @@ set(WITH_LIBRARY_VERSIONING "ON")
set(REMMINA_VERSION_MAJOR "1")
set(REMMINA_VERSION_MINOR "2")
set(REMMINA_VERSION_REVISION "31")
-# set(REMMINA_VERSION_SUFFIX "1")
-# set(REMMINA_VERSION "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA_VERSION_REVISION}.${REMMINA_VERSION_SUFFIX}")
+set(REMMINA_VERSION_SUFFIX "1")
+set(REMMINA_VERSION "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA_VERSION_REVISION}.${REMMINA_VERSION_SUFFIX}")
set(REMMINA_VERSION "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA_VERSION_REVISION}")
message(STATUS "Remmina version: ${REMMINA_VERSION}")