Merge remote-tracking branch 'origin/master'

This commit is contained in:
doitux
2012-06-22 01:01:33 +02:00
2 changed files with 9 additions and 2 deletions
+7
View File
@@ -1,3 +1,10 @@
2012-06-21 version 0.9.5
- First experimental Android release (#80)
- Add a minimize button to the Lobby window (#59)
- Fixed crash when trying to connect to non existing network game (#138)
- Ignore additional join game messages if the player already joined a game (#134)
- Double game invite no longer leads to kick (#135)
2012-04-09 version 0.9.4 2012-04-09 version 0.9.4
- New report bad-game-name system (right-click on a game in the lobby) (#129) - New report bad-game-name system (right-click on a game in the lobby) (#129)
- Raise-blind sound is now optional (#127) - Raise-blind sound is now optional (#127)
+2 -2
View File
@@ -29,11 +29,11 @@
#define HTML_LOG 0 #define HTML_LOG 0
#define POKERTH_VERSION_MAJOR 0 #define POKERTH_VERSION_MAJOR 0
#define POKERTH_VERSION_MINOR 94 #define POKERTH_VERSION_MINOR 95
#define POKERTH_VERSION ((POKERTH_VERSION_MAJOR << 8) | POKERTH_VERSION_MINOR) #define POKERTH_VERSION ((POKERTH_VERSION_MAJOR << 8) | POKERTH_VERSION_MINOR)
#define POKERTH_BETA_REVISION 0 #define POKERTH_BETA_REVISION 0
#define POKERTH_BETA_RELEASE_STRING "0.9.4" #define POKERTH_BETA_RELEASE_STRING "0.9.5"
#define SQLITE_LOG_VERSION 1 #define SQLITE_LOG_VERSION 1