Jens Rommel f10426cfc8 Merge from master ...

Resolved conflict annoying GWT Remote Profiling launch config by using "theirs".

2013-06-20 10:37:52 +02:00

..

.settings

Merge branch 'master' into jens--media-synch

2013-04-19 11:15:35 +02:00

META-INF

Merge from master

2013-06-20 10:37:52 +02:00

src/com/sap/sailing/domain

Merge from master

2013-06-20 10:37:52 +02:00

.classpath

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

.gitignore

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

.project

Merge branch 'master' into jens--media-synch

2013-04-19 11:15:35 +02:00

build.properties

Merge branch 'master' into jens--media-synch

2013-04-19 11:15:35 +02:00

pom.xml

Merge branch 'master' into jens--media-synch

2013-04-19 11:15:35 +02:00