Nick Klose ddf68fc794 Fixed Conflicts.

2013-11-11 14:08:53 +01:00

..

backup-json

added backup of json's

2013-06-27 21:39:48 +02:00

com.sap.sailing.racecommittee.app

Fixed Conflicts.

2013-11-11 14:08:53 +01:00

com.sap.sailing.racecommittee.app.test

provided fix for bug 1524 by also escaping the "\" character

2013-09-19 09:53:03 +02:00

com.sap.sailing.racecommittee.glue

restored project.properties in android projects to fix deployment error

2013-07-18 18:27:26 +02:00

google-play-services_lib

# explicit logging out of course area to support correct reloading of data

2013-07-29 16:34:50 +02:00