Armin Zamani fe2ca8196d Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated ...

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java

2013-02-23 23:46:22 +01:00

..

.settings

Merge branch 'master' into 'gwt25'

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

META-INF

# moved everything used by Android projects of com.sap.sailing.domain into new bundle com.sap.sailing.domain.shared.android

2013-02-18 13:26:32 +01:00

src/com/sap/sailing/domain/persistence

Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated

2013-02-23 23:46:22 +01:00

.classpath

Merge branch 'master' into 'gwt25'

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

.gitignore

add missing .gitignore files

2011-12-13 11:58:28 +01:00

.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