Ruben 25b2e09f5e Merge branch 'master' into kioskmode ... Now having the back button in the credits screen and some minor bugfixes		2017-09-20 09:01:48 +02:00
..
androidTest/java/com/rubenvandeven/emotionhero	Initial 'game' setup	2016-08-16 19:25:28 +02:00
main	Merge branch 'master' into kioskmode	2017-09-20 09:01:48 +02:00
test/java/com/rubenvandeven/emotionhero	Initial 'game' setup	2016-08-16 19:25:28 +02:00