Axel Uhl 0ea6f28d7f Merge branch 'master' into leaderboard-refactoring ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ConnectTrackedRaceToLeaderboardColumn.java

2012-05-21 13:30:55 +02:00

..

.settings

switched all projects to Java7 except for those used by as GWT source

2012-01-19 10:01:36 +01:00

META-INF

first successful tiny and trivial Operational Transformation test, replicating the addition of a leaderboard

2012-03-28 14:51:13 +02:00

src/com/sap/sailing/server/test

Merge branch 'master' into leaderboard-refactoring

2012-05-21 13:30:55 +02:00

.classpath

switched all projects to Java7 except for those used by as GWT source

2012-01-19 10:01:36 +01:00

.gitignore

added RaceHandle return to addRace so clients can identify what they are tracking

2011-06-13 17:48:21 +02:00

.project

remove m2e nature from all .project files

2011-11-09 22:06:14 +01:00

build.properties

added RaceHandle return to addRace so clients can identify what they are tracking

2011-06-13 17:48:21 +02:00

pom.xml

clean up of all version in all pom.xml files

2012-01-04 16:04:23 +01:00