Merge branch 'V3.2' into 'devel'
V3.2 See merge request !358
Showing
- android/assets/text/application/application_cs.properties 1 addition, 1 deletionandroid/assets/text/application/application_cs.properties
- android/src/main/java/cz/nic/tablexia/android/AndroidLauncher.java 6 additions, 8 deletions...rc/main/java/cz/nic/tablexia/android/AndroidLauncher.java
- core/external 1 addition, 1 deletioncore/external
- core/src/cz/nic/tablexia/model/game/GameDAO.java 13 additions, 2 deletionscore/src/cz/nic/tablexia/model/game/GameDAO.java
- core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java 1 addition, 1 deletion...c/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
Please register or sign in to comment