Merge branch '2.3.x'

Foaly · Sep 10, 2015 · 58643d7 · 58643d7
2 parents c55b8c1 + 01d7243
commit 58643d7
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,7 +40,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake)
 # setup version numbers
 set(VERSION_MAJOR 2)
 set(VERSION_MINOR 3)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
 
 # add the SFML header path
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,38 @@
+SFML 2.3.2
+==========
+
+Also available on the website: http://www.sfml-dev.org/changelog.php#sfml-2.3.2
+
+General
+=======
+
+* Fixed an issue where FindSFML.cmake couldn't find older versions of SFML (#903)
+* Robust alCheck and glCheck macros (#917)
+* Fixed FindSFML.cmake to use the uppercase FLAC name (#923)
+* Added a CONTRIBUTING file so GitHub shows a message when creating a new issue (#932)
+
+
+Window
+======
+
+Bugfixes
+--------
+* [Linux] Fixed an issue where the keypad's key weren't being detected (#910)
+* [Linux] Revert to Xlib event handling (#934)
+* [Linux] Fixed XK_* inconsistency in InpuImpl.cpp (#947)
+* [Linux] Fix _NET_WM_PING messages not being replied to properly (#947)
+
+
+Graphics
+========
+
+Bugfixes
+--------
+* Fixed clear bug on RenderTextures (#915)
+* Fixed image file extension detection (#929, #930, #931)
+* Secure function against random data return (#935, #942)
+
+
 SFML 2.3.1
 ==========
 

diff --git a/include/SFML/Config.hpp b/include/SFML/Config.hpp
@@ -31,7 +31,7 @@
 ////////////////////////////////////////////////////////////
 #define SFML_VERSION_MAJOR 2
 #define SFML_VERSION_MINOR 3
-#define SFML_VERSION_PATCH 1
+#define SFML_VERSION_PATCH 2
 
 
 ////////////////////////////////////////////////////////////