Gongxter 3d110b57c5 Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/java/org/secuso/privacyfriendlysudoku/controller/SaveLoadStatistics.java # app/src/main/res/drawable/standalone_button.xml		2016-01-21 16:12:57 +01:00
..
controller	Merge remote-tracking branch 'origin/master'	2016-01-21 16:12:57 +01:00
game	Added some strings and HintListener	2016-01-21 16:08:48 +01:00
ui	Merge remote-tracking branch 'origin/master'	2016-01-21 16:12:57 +01:00