Daniele Gobbetti 176cf79cc1 Merge branch 'master' into new_GUI ... # Conflicts: # app/build.gradle		2017-02-26 16:55:54 +01:00
..
src	Merge branch 'master' into new_GUI	2017-02-26 16:55:54 +01:00
build.gradle	Merge branch 'master' into new_GUI	2017-02-26 16:55:54 +01:00
proguard-rules.pro	First checkin of actual code	2015-01-07 14:00:18 +01:00