Merge branch 'bug2572' into android_apps

This commit is contained in:
Peter Siegmund
2015-01-14 17:02:18 +01:00
211 changed files with 873 additions and 840 deletions
+10 -1
View File
@@ -18,4 +18,13 @@ build
java/com.sap.sailing.simulator/bin/com/sap/sailing/simulator/Simulator.gwt.xml
/mobile/com.sap.sailing.racecommittee.app/res/values/keys.xml
java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
## Android Studio and Intellij and Android in general
gen/
.idea/
*.ipr
*.iws
*.iml
out/
.gradle