Commit 1ab60b46 authored 9 years ago by Luboš Horáček

Merge branch 'feature-halloffame' into devel

Conflicts:
	core/src/cz/nic/tablexia/TablexiaSettings.java
	core/src/cz/nic/tablexia/util/ui/dialog/TextDialog.java

parents 99c1a8f2 cee91250

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

android/assets/text/screen/halloffame/halloffame_cs.properties 120 additions, 0 deletions

...id/assets/text/screen/halloffame/halloffame_cs.properties
android/assets/text/screen/halloffame/halloffame_cs.properties~ 120 additions, 0 deletions

...d/assets/text/screen/halloffame/halloffame_cs.properties~
android/assets/text/screen/halloffame/halloffame_sk.properties 0 additions, 0 deletions

...id/assets/text/screen/halloffame/halloffame_sk.properties
android/assets/text/screen/halloffame/halloffame_sk.properties~ 74 additions, 0 deletions

...d/assets/text/screen/halloffame/halloffame_sk.properties~
core/assets/common/screen/halloffame/screen_halloffame_dialog_banner.png 0 additions, 0 deletions

...mon/screen/halloffame/screen_halloffame_dialog_banner.png
core/assets/common/screen/halloffame/trophy/trophy_in_the_darkness_10_finished_small.png 0 additions, 0 deletions

...ffame/trophy/trophy_in_the_darkness_10_finished_small.png
core/assets/common/screen/halloffame/trophy/trophy_in_the_darkness_1_finished_small.png 0 additions, 0 deletions

...offame/trophy/trophy_in_the_darkness_1_finished_small.png
core/assets/common/screen/halloffame/trophy/trophy_in_the_darkness_1_limit_small.png 0 additions, 0 deletions

...alloffame/trophy/trophy_in_the_darkness_1_limit_small.png
core/assets/common/screen/halloffame/trophy/trophy_in_the_darkness_2_limit_small.png 0 additions, 0 deletions

...alloffame/trophy/trophy_in_the_darkness_2_limit_small.png
core/assets/common/screen/halloffame/trophy/trophy_in_the_darkness_5_finished_small.png 0 additions, 0 deletions

...offame/trophy/trophy_in_the_darkness_5_finished_small.png
core/assets/common/screen/halloffame/trophy/trophy_night_watch_10_finished_small.png 0 additions, 0 deletions

...alloffame/trophy/trophy_night_watch_10_finished_small.png
core/assets/common/screen/halloffame/trophy/trophy_night_watch_1_finished_small.png 0 additions, 0 deletions

...halloffame/trophy/trophy_night_watch_1_finished_small.png
core/assets/common/screen/halloffame/trophy/trophy_night_watch_1_limit_full.png 0 additions, 0 deletions

...een/halloffame/trophy/trophy_night_watch_1_limit_full.png
core/assets/common/screen/halloffame/trophy/trophy_night_watch_1_limit_small.png 0 additions, 0 deletions

...en/halloffame/trophy/trophy_night_watch_1_limit_small.png
core/assets/common/screen/halloffame/trophy/trophy_night_watch_2_limit_small.png 0 additions, 0 deletions

...en/halloffame/trophy/trophy_night_watch_2_limit_small.png
core/assets/common/screen/halloffame/trophy/trophy_night_watch_5_finished_small.png 0 additions, 0 deletions

...halloffame/trophy/trophy_night_watch_5_finished_small.png
core/assets/common/screen/halloffame/trophy/trophy_shooting_range_10_finished_small.png 0 additions, 0 deletions

...offame/trophy/trophy_shooting_range_10_finished_small.png
core/assets/common/screen/halloffame/trophy/trophy_shooting_range_1_finished_small.png 0 additions, 0 deletions

...loffame/trophy/trophy_shooting_range_1_finished_small.png
core/assets/common/screen/halloffame/trophy/trophy_shooting_range_1_limit_small.png 0 additions, 0 deletions

...halloffame/trophy/trophy_shooting_range_1_limit_small.png
core/assets/common/screen/halloffame/trophy/trophy_shooting_range_2_limit_small.png 0 additions, 0 deletions

...halloffame/trophy/trophy_shooting_range_2_limit_small.png

with 314 additions and 0 deletions

Please register or to comment

Admin message

Merge branch 'feature-halloffame' into devel