Merge branch 'develop'

aryan-gupta · Apr 27, 2017 · 546594c · 546594c
2 parents 9ed3190 + a2ddda9
commit 546594c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,29 @@
+# Change Log #
+All notable changes to this project will be documented in this file.
+
+## [Unreleased] ##
+
+
+## [v1.2] ##
+### Fixed
+- Memory-leak issue when finding melds
+- Improper window title
+### Added
+- CHANGELOG.md file
+
+## [v1.1] - 2017-04-26 ##
+### Added
+- Runner program
+### Updated
+- PPD macros
+- Makefile
+- README.md
+
+## [v1.0] - 2017-04-26 ##
+- First Release!
+
+[v1.0]: https://github.com/Kuantum-Freak/GinRummy/compare/7da948...Release-v1.0
+[v1.1]: https://github.com/Kuantum-Freak/GinRummy/compare/Release-v1.0...Release-v1.1
+[v1.2]: https://github.com/Kuantum-Freak/GinRummy/compare/Release-v1.1...Release-v1.2
+
+[Unreleased]: https://github.com/Kuantum-Freak/GinRummy/compare/Release-v1.2...HEAD
diff --git a/Window.cpp b/Window.cpp
@@ -52,7 +52,7 @@ const char* HELP_TEXT[] = {
 Window::Window() {
 	if( NULL ==
 		(window = SDL_CreateWindow(  // Create our Window
-			R_PRGMNAME,  // Window name
+			R_DESCRIPTION,  // Window name
 			SDL_WINDOWPOS_UNDEFINED,  // Window position (x)
 			SDL_WINDOWPOS_UNDEFINED,  // Window position (y)
 			SCRN_W, SCRN_H,  // Screen size

diff --git a/bin/libgcc_s_dw2-1.dll b/bin/libgcc_s_dw2-1.dll
diff --git a/bin/libstdc++-6.dll b/bin/libstdc++-6.dll
diff --git a/info.h b/info.h
@@ -22,7 +22,7 @@
 #define INFO_H_INCLUDED
 
 // =================  PROGRAM  INFO  =================
-#define R_PVERSION	       /* Version Number */ "1.1.0"
+#define R_PVERSION	       /* Version Number */ "1.2.0"
 
 #define R_PROJNAME		     /* Project Name */ "GinRummy"
 #define R_DESCRIPTION	      /* Description */ "Gin Rummy"