fmittag aa7392cc2d Merge remote-tracking branch 'origin/master' into buoyzone_drawing ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java

2013-02-18 17:50:32 +01:00

..

.settings

Merge branch 'master' into gwt25

2013-01-08 15:18:41 +01:00

META-INF

Added method in sailing service for polar sheet generation

2013-01-24 15:53:01 +01:00

src/com/sap/sailing

Merge remote-tracking branch 'origin/master' into buoyzone_drawing

2013-02-18 17:50:32 +01:00

.classpath

Merge branch 'master' into 'gwt25'

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

.gitignore

moved all Java stuff to java/ subdir

2011-06-10 16:39:27 +02: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