Merge branch 'racecommittee_integrated' of

ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
This commit is contained in:
Armin Zamani committed 2013-04-11 00:28:12 +02:00
commit b501d1ca6f
2382 files changed
+1283491 -1283408

No files matched your search

@@ -1,14 +1,14 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Resultimport
Bundle-SymbolicName: com.sap.sailing.xrr.resultimport
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: com.sap.sailing.xrr.resultimport,
com.sap.sailing.xrr.resultimport.impl,
com.sap.sailing.xrr.resultimport.schema
Import-Package: org.osgi.framework;version="1.6.0"
Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.domain.common
Bundle-Activator: com.sap.sailing.xrr.resultimport.impl.Activator
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Resultimport
Bundle-SymbolicName: com.sap.sailing.xrr.resultimport
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Export-Package: com.sap.sailing.xrr.resultimport,
com.sap.sailing.xrr.resultimport.impl,
com.sap.sailing.xrr.resultimport.schema
Import-Package: org.osgi.framework;version="1.6.0"
Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.domain.common
Bundle-Activator: com.sap.sailing.xrr.resultimport.impl.Activator