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 usermanagement

Browse Source 
Conflicts:
	java/com.sap.sailing.gwt.ui/.gitignore
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/panels/UserStatusPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVViewController.java
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
This commit is contained in:
Benjamin Ebling committed 2014-06-04 15:49:02 +02:00
2 parents e2fc77b46c c204bece9c
commit d46376eb40
850 files changed
+145963 -28296
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
+1 -1
View File
@@ -100,7 +100,7 @@
id="routeconverter"
download-size="0"
install-size="0"
version="2.8.0.20130705130507"
version="2.12.2.201406032322"
unpack="false"/>
<plugin