Files
sailing-analytics/java/target/configuration
Jens Rommel f9170db047 Merge remote-tracking branch 'origin/master' into media
Conflicts:
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	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.server/SailingServer (Proxy).launch
2013-01-06 12:28:27 +01:00
..