Merge remote-tracking branch 'origin/master' into competitor_filtering

This commit is contained in:
fmittag committed 2013-04-18 10:47:14 +02:00
commit bc051516e3
2 files changed
+3 -4

No files matched your search

@@ -6,8 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Fragment-Host: com.sap.sailing.mongodb
Require-Bundle: org.eclipse.osgi,
com.sap.sailing.domain,
Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.domain.shared.android,
com.sap.sailing.domain.test,
com.tractrac.clientmodule;bundle-version="2.0.0",
@@ -10,5 +10,5 @@ Export-Package: com.sap.sailing.resultimport,
com.sap.sailing.resultimport.impl
Import-Package: com.sap.sailing.domain.base.impl,
com.sap.sailing.domain.common,
com.sap.sailing.domain.common.impl
Require-Bundle: org.eclipse.osgi;bundle-version="3.7.1"
com.sap.sailing.domain.common.impl,
org.osgi.framework;version="1.5.0"