Merge branch 'racecommittee_integrated' of

ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
This commit is contained in:
Armin Zamani
2013-04-11 00:28:12 +02:00
2382 changed files with 1283491 additions and 1283408 deletions
+22 -22
View File
@@ -1,22 +1,22 @@
/target
build.log
.metadata
*.class
*.swp
*~
manifest.txt
java/com.sap.sailing.gwt.ui/gwt-unitCache/*
java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/*
sailing_debug0*
/java/.settings/org.eclipse.jdt.core.prefs
/mobile/com.sap.sailing.racecommittee.app/.settings/org.eclipse.jdt.core.prefs
/mobile/com.sap.sailing.racecommittee.app/bin/*
/mobile/com.sap.sailing.racecommittee.app/gen/*
/mobile/com.sap.sailing.racecommittee.glue/.settings/org.eclipse.jdt.core.prefs
/mobile/com.sap.sailing.racecommittee.glue/bin/*
/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
/target
build.log
.metadata
*.class
*.swp
*~
manifest.txt
java/com.sap.sailing.gwt.ui/gwt-unitCache/*
java/com.sap.sailing.gwt.ui/war/WEB-INF/deploy/*
sailing_debug0*
/java/.settings/org.eclipse.jdt.core.prefs
/mobile/com.sap.sailing.racecommittee.app/.settings/org.eclipse.jdt.core.prefs
/mobile/com.sap.sailing.racecommittee.app/bin/*
/mobile/com.sap.sailing.racecommittee.app/gen/*
/mobile/com.sap.sailing.racecommittee.glue/.settings/org.eclipse.jdt.core.prefs
/mobile/com.sap.sailing.racecommittee.glue/bin/*
/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