Files
sailing-analytics/java/com.sap.sailing.datamining/META-INF
Lennart Hensler a6dbf58d7e Merge remote-tracking branch 'origin/master' into dataMining
Conflicts:
	java/com.sap.sailing.datamining.shared/META-INF/MANIFEST.MF
	java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/impl/SimpleQueryDefinition.java
	java/com.sap.sailing.datamining/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2014-03-15 08:18:56 +01:00
..