Axel Uhl 39b1c55a88 made compileable after master mergeMerge branch 'master' into ftes-mail-move-to-sse ...

Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Cached MTB).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8890).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, winddbTest).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/SailingServer (Proxy, winddbTest).launch
	java/com.sap.sse.security.test/META-INF/MANIFEST.MF
	java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java
	java/com.sap.sse.security/src/com/sap/sse/security/impl/Activator.java
	java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java

2015-02-14 21:23:24 +01:00

..

MANIFEST.MF

made compileable after master mergeMerge branch 'master' into ftes-mail-move-to-sse

2015-02-14 21:23:24 +01:00