Daniele Gobbetti 68608f8582 Fix merge conflicts (from 3abbe12b53) and update the support libraries. Add constraint layout library.		2017-03-11 16:45:39 +01:00
..
src	Merge branch 'master' into new_GUI	2017-03-11 16:44:16 +01:00
build.gradle	Fix merge conflicts (from 3abbe12b53) and update the support libraries. Add constraint layout library.	2017-03-11 16:45:39 +01:00
proguard-rules.pro	First checkin of actual code	2015-01-07 14:00:18 +01:00