Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated

Conflicts:
	.gitignore
This commit is contained in:
Armin Zamani
2013-01-23 13:44:38 +01:00
32 changed files with 754 additions and 55 deletions
+3
View File
@@ -16,3 +16,6 @@ sailing_debug0*
/mobile/com.sap.sailing.racecommittee.glue/gen/*
/mobile/com.sap.sailing.racecommittee.glue/bin
/mobile/com.sap.sailing.racecommittee.glue/gen
/mobile/com.sap.sailing.racecommittee.glue/bin/com.sap.sailing.racecommittee.glue.jar
/mobile/com.sap.sailing.racecommittee.glue/bin/jarlist.cache
/java/com.sap.sailing.server.gateway.serialization.test/.settings/*.prefs