Merge branch 'devel' into feature-createuser
Conflicts: core/src/cz/nic/tablexia/TablexiaSettings.java
Showing
- core/src/cz/nic/tablexia/TablexiaApplication.java 2 additions, 2 deletionscore/src/cz/nic/tablexia/TablexiaApplication.java
- core/src/cz/nic/tablexia/TablexiaSettings.java 12 additions, 12 deletionscore/src/cz/nic/tablexia/TablexiaSettings.java
- core/src/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java 1 addition, 1 deletion...c/cz/nic/tablexia/screen/gamemenu/pages/GameMenuPage.java
- core/src/cz/nic/tablexia/screen/viewport/ViewportDebugScreen.java 14 additions, 8 deletions.../cz/nic/tablexia/screen/viewport/ViewportDebugScreen.java
- core/src/cz/nic/tablexia/util/ui/XFillViewport.java 17 additions, 23 deletionscore/src/cz/nic/tablexia/util/ui/XFillViewport.java
Please register or sign in to comment