Merge remote-tracking branch 'extern/master' into dataMining

Conflicts:
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-ide-local.target
This commit is contained in:
Lennart Hensler committed 2013-10-02 13:48:48 +02:00
commit 0ccdb93814
254 files changed
+5040 -2024

No files matched your search

+2 -1
View File
@@ -48,7 +48,8 @@
<!-- GWT version detected from dependencyManagement -->
<execution>
<configuration>
<extraJvmArgs>-Dgwt.persistentunitcache=false</extraJvmArgs>
<extraJvmArgs>-Dgwt.persistentunitcache=false</extraJvmArgs>
<userAgents>chrome</userAgents>
<modules>
<module>com.sap.sailing.gwt.ui.AdminConsole</module>
<module>com.sap.sailing.gwt.ui.Leaderboard</module>