Oliver Jan Krylow f600d5f2dc Merge branch 'master' of https://github.com/LonamiWebs/Klooni1010 ... # Conflicts: # core/src/io/github/lonamiwebs/klooni/Klooni.java		2017-04-09 21:12:14 +02:00
..
assets	Use a more appropriated font size	2017-04-09 20:39:10 +02:00
res	Add new icon	2017-01-26 20:12:10 +01:00
src/io/github/lonamiwebs/klooni	Update to gradle 3.3 and light cleanup.	2017-04-09 21:07:15 +02:00
AndroidManifest.xml	Add new icon	2017-01-26 20:12:10 +01:00
build.gradle	Update to v0.4	2017-02-18 20:07:45 +01:00
proguard-project.txt	Add main menu screen	2017-01-22 15:34:45 +01:00
project.properties	Add main menu screen	2017-01-22 15:34:45 +01:00