fmittag 64d968cc04 Merge remote-tracking branch 'origin/master' into design2015 ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.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/client/StringMessages_ru.properties

2015-04-13 17:04:01 +02:00

..

classes

…

lib

moved gwt-servlet.jar to gwt.osgi bundle so it can be shared by other server-side bundles at runtime

2014-04-07 17:02:00 +02:00

.gitignore

…

web.xml

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

2015-04-13 17:04:01 +02:00