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
This commit is contained in:
Axel Uhl committed 2011-12-29 14:56:10 +01:00
commit 5c8e8a9637
63 files changed
+366 -199

No files matched your search

@@ -3,6 +3,5 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>