fmittag c902ddeea3 Merge remote-tracking branch 'origin/dataMining' into sse_gwt_refactoring ...

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/AbstractEntryPoint.java
	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/datamining/DataMiningEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/DataMining.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/PolarSheets.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/Simulator.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/VideoPopup.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/YoutubePopup.gwt.xml
	java/com.sap.sailing.server/SailingServer (No Proxy).launch

2014-03-18 14:29:55 +01:00

..

com.google.appengine.eclipse.core.prefs

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

com.google.gdt.eclipse.core.prefs

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

com.google.gwt.eclipse.core.prefs

Merge remote-tracking branch 'origin/dataMining' into sse_gwt_refactoring

2014-03-18 14:29:55 +01:00

org.eclipse.core.resources.prefs

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

org.eclipse.jdt.core.prefs

changed used Java SDK to 1.7 for gwt.ui bundle and fixed warnings

2014-03-14 11:20:11 +01:00

org.eclipse.m2e.core.prefs

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

org.eclipse.pde.core.prefs

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00