Commit Graph
2 Commits
Author SHA1 Message Date
Armin Zamani b501d1ca6f Merge branch 'racecommittee_integrated' of
ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
2013-04-11 00:28:12 +02:00
Axel Uhl d95c025ce0 fetched marineapi-0.5 sources from SVN and put into source bundles net.sf.marineapi[.test] 2013-01-07 09:36:29 +01:00