eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-28 14:57:12 +00:00
Code Activity

Merge branch 'master' into dataMining

Browse Source 
Conflicts:
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/build.properties
	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/client/SailingServiceAsync.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
	java/pom.xml
This commit is contained in:
Lennart Hensler committed 2013-12-19 17:25:47 +01:00
2 parents 5d1a200305 a1cc7a0470
commit adbeb04b24
1301 files changed
+31609 -13375
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
+14
View File
@@ -89,4 +89,18 @@
version="2.1.6"
unpack="false"/>
<plugin
id="org.apache.felix.shell"
download-size="0"
install-size="0"
version="1.4.3"
unpack="false"/>
<plugin
id="org.apache.felix.shell.remote"
download-size="0"
install-size="0"
version="1.1.2"
unpack="false"/>
</feature>