Armin Zamani 64d422358a Merge branch 'master' into racecommittee_integrated ...

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/RaceColumnListeners.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/LeaderboardDTOCache.java

2013-01-16 15:29:44 +01:00

..

.settings

Merge branch 'master' into 'gwt25'

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

META-INF

added lazy activation policy for persistence bundle

2012-06-20 17:46:26 +02:00

src/com/sap/sailing/domain/persistence

Merge branch 'master' into racecommittee_integrated

2013-01-16 15:29:44 +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