Gongxter b25b55afb7 Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/java/org/secuso/privacyfriendlysudoku/controller/SaveLoadStatistics.java # app/src/main/res/values/strings.xml		2016-01-21 16:55:24 +01:00
..
colors.xml	Edit Buttons and slideshow with arrows	2015-11-30 18:02:00 +01:00
dimens.xml	Fixed a lot of stuff.. and added ... stuff....... yay.	2016-01-19 15:15:47 +01:00
strings.xml	Merge remote-tracking branch 'origin/master'	2016-01-21 16:55:24 +01:00
styles.xml	small changes	2016-01-20 09:43:23 +01:00