Axel Uhl 7cc977f0ad Merge branch 'master' into integration_tests ...

Conflicts:
	java/.gitignore
	java/com.sap.sailing.operationaltransformation/bin/com/sap/sailing/operationaltransformation/package.html

2013-01-09 09:35:57 +01:00

..

.settings

Merge branch 'master' into 'integration_tests'

2013-01-07 17:24:21 +01:00

META-INF

introduced overall leaderboard on LeaderboardGroup(Impl) including persistence

2012-08-17 17:13:51 +02:00

src/com/sap/sailing

Merge branch 'master' into integration_tests

2013-01-09 09:35:57 +01:00

.classpath

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

.gitignore

…

.project

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

build.properties

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

pom.xml

clean up of all version in all pom.xml files

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