From 5268914b3fc222e5a54d0d42a5c0956a64334b53 Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Fri, 20 Mar 2015 00:12:00 +0100
Subject: [PATCH] Started 3.1.2.

---
 CMakeLists.txt       |  2 +-
 README.md            | 24 +-----------------------
 docs/window.dox      |  2 +-
 include/GLFW/glfw3.h |  2 +-
 src/internal.h       |  2 +-
 5 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index efb559c9..4a169473 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ endif()
 
 set(GLFW_VERSION_MAJOR "3")
 set(GLFW_VERSION_MINOR "1")
-set(GLFW_VERSION_PATCH "1")
+set(GLFW_VERSION_PATCH "2")
 set(GLFW_VERSION_EXTRA "")
 set(GLFW_VERSION "${GLFW_VERSION_MAJOR}.${GLFW_VERSION_MINOR}")
 set(GLFW_VERSION_FULL "${GLFW_VERSION}.${GLFW_VERSION_PATCH}${GLFW_VERSION_EXTRA}")
diff --git a/README.md b/README.md
index 338b349e..d2f3eb14 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,7 @@ GLFW is a free, Open Source, multi-platform library for OpenGL and OpenGL ES
 application development.  It provides a simple, platform-independent API for
 creating windows and contexts, reading input, handling events, etc.
 
-Version 3.1.1 adds fixes for a number of bugs that together affect all supported
-platforms, most notably workarounds for bugs in some popular window managers.
+Version 3.1.2 is _not yet described_.
 
 If you are new to GLFW, you may find the
 [introductory tutorial](http://www.glfw.org/docs/latest/quick.html) for GLFW
@@ -63,27 +62,6 @@ GLFW bundles a number of dependencies in the `deps/` directory.
 
 ## Changelog
 
- - Made library compilation fail if any header option macros are defined
- - Removed support for LCC and Borland C++
- - Bugfix: `glfwSetTime` silently accepted invalid values
- - [Cocoa] Bugfix: `NSHighResolutionCapable` was not enabled for test and
-                   example programs
- - [Cocoa] Bugfix: Sleeping monitors were not included in the monitor list
- - [Cocoa] Bugfix: `glfwSetWindowSize` did not change the video mode for full
-                   screen windows
- - [X11] Added support for Cygwin-X
- - [X11] Made XInput2 optional at compile-time
- - [X11] Made Xxf86vm optional at compile-time
- - [X11] Bugfix: Moved `_NET_REQUEST_FRAME_EXTENTS` request to
-                 `glfwGetWindowFrameSize` and added protocol-breaking timeout
-                 as a workaround for broken support in Unity, Fluxbox and Xfwm
- - [X11] Bugfix: Mouse button `GLFW_MOUSE_BUTTON_4` was never used
- - [X11] Bugfix: `glfwTerminate` could close an unrelated file descriptor
- - [X11] Bugfix: Some WMs (KWM, Fluxbox) did not respect cursor redefinition
- - [WGL] Bugfix: The context flags debug bit was not set for OpenGL ES
- - [GLX] Bugfix: The context flags debug bit was not set for OpenGL ES
- - [EGL] Bugfix: The context flags debug bit was not set for OpenGL ES
-
 
 ## Contact
 
diff --git a/docs/window.dox b/docs/window.dox
index 588481e7..cb940f05 100644
--- a/docs/window.dox
+++ b/docs/window.dox
@@ -538,7 +538,7 @@ As long as your source file is encoded as UTF-8, you can use any Unicode
 characters directly in the source.
 
 @code
-glfwSetWindowTitle(window, "おもひでぽろぽろ");
+glfwSetWindowTitle(window, "プラネテス");
 @endcode
 
 
diff --git a/include/GLFW/glfw3.h b/include/GLFW/glfw3.h
index 009fa755..0ba09939 100644
--- a/include/GLFW/glfw3.h
+++ b/include/GLFW/glfw3.h
@@ -211,7 +211,7 @@ extern "C" {
  *  API changes.
  *  @ingroup init
  */
-#define GLFW_VERSION_REVISION       1
+#define GLFW_VERSION_REVISION       2
 /*! @} */
 
 /*! @name Key and button actions
diff --git a/src/internal.h b/src/internal.h
index 55a87f8e..979b83cc 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -33,7 +33,7 @@
  #include "glfw_config.h"
 #endif
 
-#define _GLFW_VERSION_NUMBER "3.1.1"
+#define _GLFW_VERSION_NUMBER "3.1.2"
 
 #if defined(GLFW_INCLUDE_GLCOREARB) || \
     defined(GLFW_INCLUDE_ES1)       || \