Andreas Shimokawa 68f83d3f33 Merge branch 'master' into new_GUI		2016-10-21 13:21:32 +02:00
..
src	Merge branch 'master' into new_GUI	2016-10-21 13:21:32 +02:00
build.gradle	Merge branch 'master' into new_GUI	2016-10-21 13:21:32 +02:00
proguard-rules.pro	First checkin of actual code	2015-01-07 14:00:18 +01:00