Christopher Beckmann 5d9863bdee Merge remote-tracking branch 'origin/master' ... Conflicts: app/app.iml app/src/main/res/values/strings.xml		2016-02-18 14:47:05 +01:00
..
src	Merge remote-tracking branch 'origin/master'	2016-02-18 14:47:05 +01:00
.gitignore	First Commit. Adding some Source code.	2015-11-09 12:41:46 +01:00
app.iml	Merge remote-tracking branch 'origin/master'	2016-02-18 14:47:05 +01:00
build.gradle	Added some Layouts for landscape ordientation as well as some for high density screens.	2016-01-30 12:38:26 +01:00
proguard-rules.pro	First Commit. Adding some Source code.	2015-11-09 12:41:46 +01:00