mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-21 05:05:31 +00:00
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:
+22
-22
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user