Files
sailing-analytics/java/target
Axel Uhl c972c9e3d1 Merge branch 'gwt' into osgi_mvn_refactoring
Conflicts:
	java/com.sap.sailing.gwt.ui.test/.gitignore
	java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.api/.project
	java/com.sap.sailing.server.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
2011-12-28 15:37:10 +01:00
..
2011-12-09 16:59:23 +01:00
2011-06-10 17:22:51 +02:00
2011-06-10 17:22:51 +02:00