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

This commit is contained in:
fmittag committed 2012-11-12 10:43:16 +01:00
commit 05b81d7646
243 files changed
+11279 -3342

No files matched your search

@@ -10,7 +10,7 @@ Require-Bundle: com.sap.sailing.domain,
com.googlecode.java-diff-utils;bundle-version="1.3.0",
com.sap.sailing.domain.common
Export-Package: com.sap.sailing.domain.tractracadapter,
com.sap.sailing.domain.tractracadapter.impl;x-friends:="com.sap.sailing.domain.test"
com.sap.sailing.domain.tractracadapter.impl;x-friends:="com.sap.sailing.domain.test,com.sap.sailing.domain.swisstimingadapter.test"
Bundle-ActivationPolicy: lazy
Import-Package: org.json.simple,
org.json.simple.parser