From e4ae4f9cc3c3588a3634f46f436f77c051a85325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20D=C3=BCrrenberger?= <eXpl0it3r@sfml-dev.org>
Date: Mon, 6 Feb 2017 17:44:17 +0100
Subject: [PATCH] Increased SFML's version number and updated the changelogs.

---
 CMakeLists.txt          |  2 +-
 changelog.txt           | 35 ++++++++++++++++++++++++++++++++++-
 include/SFML/Config.hpp |  2 +-
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77589da76..e7914ac93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Config.cmake)
 # setup version numbers
 set(VERSION_MAJOR 2)
 set(VERSION_MINOR 4)
-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
index 666e25427..7b08dad13 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,36 @@
+SFML 2.4.2
+==========
+
+Also available on the website: http://www.sfml-dev.org/changelog.php#sfml-2.4.2
+
+System
+======
+
+Bugfixes
+--------
+* [Windows] Removed thread affinity changes in sf::Clock (#1107)
+
+
+Window
+======
+
+Bugfixes
+--------
+* Fixed bug where TransientContextLock would hang (#1165, #1172)
+* [Linux] Fixed GLX extensions being loaded too late (#1183)
+* [Linux] Fix wrong types passed to XChangeProperty (#1168 #1171)
+* [Windows] Make context disabling via wglMakeCurrent more tolerant of broken drivers (#1186)
+
+
+Graphics
+========
+
+Bugfixes
+--------
+* Optimized sf::Image::create and made it more exception safe (#1166)
+
+
+
 SFML 2.4.1
 ==========
 
@@ -7,7 +40,7 @@ General
 =======
 
 * [kFreeBSD] Define SFML_OS_FREEBSD when compiling for kFreeBSD (#1129)
-* [Window] Added some simple messaging when trying to build under Cygwin (#1153)
+* [Windows] Added some simple messaging when trying to build under Cygwin (#1153)
 
 
 Window
diff --git a/include/SFML/Config.hpp b/include/SFML/Config.hpp
index cd80bae49..5a8a87cfe 100644
--- a/include/SFML/Config.hpp
+++ b/include/SFML/Config.hpp
@@ -31,7 +31,7 @@
 ////////////////////////////////////////////////////////////
 #define SFML_VERSION_MAJOR 2
 #define SFML_VERSION_MINOR 4
-#define SFML_VERSION_PATCH 1
+#define SFML_VERSION_PATCH 2
 
 
 ////////////////////////////////////////////////////////////