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

Merge branch 'master' into ftes-file-storage

Browse Source 
Conflicts:
	java/com.sap.sailing.feature/feature.xml
	java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
This commit is contained in:
Fredrik Teschke committed 2015-01-23 19:40:26 +01:00
2 parents 7134f051a9 7d4b2b224f
commit daad4c8c73
19 files changed
+63 -53
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
+2 -1
View File
@@ -26,4 +26,5 @@ Require-Bundle: com.sap.sailing.server,
org.mockito.mockito-core;bundle-version="1.9.5",
com.sap.sailing.domain.shared.android,
com.sap.sse.replication.testsupport,
com.sap.sse.filestorage;bundle-version="1.0.0"
com.sap.sse.filestorage;bundle-version="1.0.0",
com.sap.sse.shared.android