From 22917f8c2159f7be42f054047c00b16b941674c8 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Thu, 29 Dec 2011 05:04:18 -0500
Subject: [PATCH] Updated the SDL version number to 1.2.15

---
 VisualC/SDL/Version.rc | 8 ++++----
 configure.in           | 6 +++---
 include/SDL_version.h  | 2 +-
 include/doxyfile       | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/VisualC/SDL/Version.rc b/VisualC/SDL/Version.rc
index d3e6cf230..39e40c810 100644
--- a/VisualC/SDL/Version.rc
+++ b/VisualC/SDL/Version.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,14,0
- PRODUCTVERSION 1,2,14,0
+ FILEVERSION 1,2,15,0
+ PRODUCTVERSION 1,2,15,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -46,12 +46,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "SDL\0"
-            VALUE "FileVersion", "1, 2, 14, 0\0"
+            VALUE "FileVersion", "1, 2, 15, 0\0"
             VALUE "InternalName", "SDL\0"
             VALUE "LegalCopyright", "Copyright © 2007 Sam Lantinga\0"
             VALUE "OriginalFilename", "SDL.dll\0"
             VALUE "ProductName", "Simple DirectMedia Layer\0"
-            VALUE "ProductVersion", "1, 2, 14, 0\0"
+            VALUE "ProductVersion", "1, 2, 15, 0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/configure.in b/configure.in
index 8d28933e1..18e4c5903 100644
--- a/configure.in
+++ b/configure.in
@@ -17,9 +17,9 @@ dnl Set various version strings - taken gratefully from the GTk sources
 #
 SDL_MAJOR_VERSION=1
 SDL_MINOR_VERSION=2
-SDL_MICRO_VERSION=14
-SDL_INTERFACE_AGE=3
-SDL_BINARY_AGE=14
+SDL_MICRO_VERSION=15
+SDL_INTERFACE_AGE=4
+SDL_BINARY_AGE=15
 SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION.$SDL_MICRO_VERSION
 
 AC_SUBST(SDL_MAJOR_VERSION)
diff --git a/include/SDL_version.h b/include/SDL_version.h
index fa02c3f6d..5df6be8a3 100644
--- a/include/SDL_version.h
+++ b/include/SDL_version.h
@@ -41,7 +41,7 @@ extern "C" {
 /*@{*/
 #define SDL_MAJOR_VERSION	1
 #define SDL_MINOR_VERSION	2
-#define SDL_PATCHLEVEL		14
+#define SDL_PATCHLEVEL		15
 /*@}*/
 
 typedef struct SDL_version {
diff --git a/include/doxyfile b/include/doxyfile
index afffb4941..29dcf5b45 100644
--- a/include/doxyfile
+++ b/include/doxyfile
@@ -23,7 +23,7 @@ PROJECT_NAME           = SDL
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.2.14
+PROJECT_NUMBER         = 1.2.15
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.