Christian Schabesberger 849a45a3ca resolve conflict		2017-01-22 14:26:01 +01:00
..
src	resolve conflict	2017-01-22 14:26:01 +01:00
.gitignore	New version number 0.6.0 and some fixes:	2015-11-10 20:51:39 +01:00
build.gradle	resolve conflict	2017-01-22 14:26:01 +01:00
proguard-rules.pro