Papick Garcia Taboada 07f36ed3ae Merge remote-tracking branch 'origin/master' into 60_inch ...

# Conflicts:
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties

2017-06-28 10:56:01 +02:00

..

.settings

normalized line endings

2017-05-16 09:42:02 +02:00

META-INF

Added additional export package concerning settings

2016-06-30 15:03:40 +02:00

src/com/sap/sse

Merge remote-tracking branch 'origin/master' into 60_inch

2017-06-28 10:56:01 +02:00

.classpath

normalized line endings

2017-05-16 09:42:02 +02:00

.gitignore

…

.project

…

AndroidManifest.xml

…

build.gradle

…

build.properties

…

pom.xml

…