Axel Uhl b35dc6cd10 Merge branch 'master' into ubilabs--tracking_app--develop--bugfix-3567-outofmemoryerror ...

Conflicts:
	mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/util/BitmapHelper.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/FinishListAdapter.java

Change-Id: I33297ab89503941afd868cf396eae7309daced25

2016-04-05 15:43:33 +02:00

..

.settings

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

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

res

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

2016-03-17 10:57:34 +01:00

src/com/sap/sailing/android

Merge branch 'master' into ubilabs--tracking_app--develop--bugfix-3567-outofmemoryerror

2016-04-05 15:43:33 +02:00

.classpath

Correct class path entry for licenses dialog library

2015-12-10 10:29:06 +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

Consistently using targetSdkVersion 22 in all AndroidManifest.xml files

2015-11-11 13:34:21 +01:00

build.gradle

changed licence into license

2016-03-10 17:40:33 +01:00

lint.xml

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

2015-05-06 11:32:59 +02:00

pom.xml

Merged master into ubilabs--tracking_app--develop

2016-01-29 10:24:41 +01:00

proguard-project.txt

renamed glue project to android.shared

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

project.properties

Merge branch 'ubilabs--tracking_app--develop' into ubilabs--rcapp--bug-3077

2015-12-17 10:22:31 +01:00