Files
sailing-analytics/java/com.sap.sailing.gwt.ui/META-INF
Axel Uhl 5c8e8a9637 Merge branch 'gwt' into osgi_mvn_refactoring
Conflicts:
	java/com.sap.sailing.domain.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.feature/feature.xml
	java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
2011-12-29 14:56:10 +01:00
..