Updated changelog for next stable

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50d8bed..062a93f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,7 +85,7 @@ if ($ENV{BUILD_NUMBER})
 endif()
 set(WITH_LIBRARY_VERSIONING "ON")
 
-set(RAW_VERSION_STRING "2.3.1")
+set(RAW_VERSION_STRING "2.3.2")
 if(EXISTS "${CMAKE_SOURCE_DIR}/.source_tag")
        file(READ ${CMAKE_SOURCE_DIR}/.source_tag RAW_VERSION_STRING)
 elseif(USE_VERSION_FROM_GIT_TAG)

diff --git a/ChangeLog b/ChangeLog
index 620a25d..38fac30 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+# 2021-XX-YY Version 2.3.2
+
+Noteworthy changes:
+
+Fixed issues:
+* #6848: Invalid format string in smartcard trace
+* #6846: Fixed static builds
+
+For a complete and detailed change log since the last release run:
+git log 2.3.1..2.3.2
+
 # 2021-03-01 Version 2.3.1
 
 Noteworthy changes:

diff --git a/client/Android/Studio/build.gradle b/client/Android/Studio/build.gradle
index 3f3f3cf..197a16b 100644 (file)
--- a/client/Android/Studio/build.gradle
+++ b/client/Android/Studio/build.gradle
@@ -29,7 +29,7 @@ def getVersionName = { ->
 
 ext {
     versionName = properties.get('VERSION_NAME', getVersionName())
-    versionCode = properties.get('VERSION_CODE', 21)
+    versionCode = properties.get('VERSION_CODE', 22)
 
     println '----------------- Project configuration -------------------'
     println 'VERSION_NAME:       ' + versionName

diff --git a/client/Android/android_freerdp.c b/client/Android/android_freerdp.c
index f28d6ce..8fa6748 100644 (file)
--- a/client/Android/android_freerdp.c
+++ b/client/Android/android_freerdp.c
@@ -56,7 +56,7 @@
 #define TAG CLIENT_TAG("android")
 
 /* Defines the JNI version supported by this library. */
-#define FREERDP_JNI_VERSION "2.3.1"
+#define FREERDP_JNI_VERSION "2.3.2"
 
 static void android_OnChannelConnectedEventHandler(void* context, ChannelConnectedEventArgs* e)
 {

diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt
index 4cc7542..19a442f 100644 (file)
--- a/winpr/CMakeLists.txt
+++ b/winpr/CMakeLists.txt
@@ -51,7 +51,7 @@ if (NOT WIN32)
 endif()
 
 # Soname versioning
-set(RAW_VERSION_STRING "2.3.1")
+set(RAW_VERSION_STRING "2.3.2")
 if(EXISTS "${CMAKE_SOURCE_DIR}/.source_tag")
        file(READ ${CMAKE_SOURCE_DIR}/.source_tag RAW_VERSION_STRING)
 elseif(USE_VERSION_FROM_GIT_TAG)