Axel Uhl ca254c72e3 Merge branch 'master' into ubilabs--buoy_positioning_app--develop ...

Conflicts:
	java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sse.gwt.theme/SSETheme_GWT sdm.launch
	java/com.sap.sse.gwt.theme/SSETheme_GWT.launch

2015-03-24 20:37:36 +01:00

..

.settings

removing discrepancies to master (old 1.6 android compiler settings somehow appeared)

2015-01-23 20:09:53 +01:00

res

Fixed build errors

2015-03-24 15:18:39 +01:00

src/com/sap/sailing/android

Buoyfragment pings marks now

2015-03-24 14:03:20 +01:00

.classpath

Second extraction

2015-03-18 17:25:23 +01:00

.gitignore

ignore gen folder

2014-10-05 16:09:08 +02:00

.project

renamed glue project to android.shared

2014-10-04 11:03:15 +02:00

AndroidManifest.xml

Merge branch 'master' into android_apps

2015-01-21 15:20:56 +01:00

build.gradle

Fixed build errors

2015-03-24 15:18:39 +01:00

lint.xml

Android apps can be compiled within Eclipse

2015-02-10 09:20:42 +01:00

pom.xml

Merge branch 'master' into ubilabs--buoy_positioning_app--develop

2015-03-24 20:37:36 +01:00

proguard-project.txt

renamed glue project to android.shared

2014-10-04 11:03:15 +02:00

project.properties

Second extraction

2015-03-18 17:25:23 +01:00