Alexander Ries 79aeb1c8a6 sovled master merge conflicts in dashboards EventLogo

2015-06-16 22:43:12 +02:00

..

.settings

moved other Position implementations to common packages to share them with GWT and make then GWT-serializable

2015-04-02 16:42:10 +02:00

META-INF

Merge branch 'master' into bug1018

2015-04-27 10:26:45 +02:00

src/com/sap/sailing

sovled master merge conflicts in dashboards EventLogo

2015-06-16 22:43:12 +02:00

.classpath

upgraded classpaths to JavaSE-1.8

2014-10-01 14:16:18 +02:00

.gitignore

…

.project

…

build.gradle

Merge branch 'bug2572' into android_apps

2015-01-14 17:02:18 +01:00

build.properties

…

pom.xml

…