mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-09-21 05:05:31 +00:00
Armin Zamani
f13a8fc469
Conflicts: java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/RegattaLeaderboardImpl.java java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.java java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java java/com.sap.sailing.gwt.ui/build.properties java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardDialog.java java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardDescriptor.java java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupDialog.java java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/AbstractLeaderboardDTO.java java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
23 lines
878 B
Plaintext
23 lines
878 B
Plaintext
/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
|