Lukas Niemeier bb58d78236 Merge branch 'master' into racecommittee_app ...

Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java

2013-10-30 14:38:14 +01:00

..

backup-json

added backup of json's

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

com.sap.sailing.racecommittee.app

Merge branch 'master' into racecommittee_app

2013-10-30 14:38:14 +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

Merge branch 'master' into racecommittee_app

2013-10-30 14:38:14 +01: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