eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-03 17:49:40 +00:00
Code Activity

Merge branch 'racecommittee_integrated' of

Browse Source 
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
2 parents 055c341ec1 98d85cd4ce
commit b501d1ca6f
2382 files changed
+1283491 -1283408
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/org.json.simple/META-INF/MANIFEST.MF
+10 -10
View File
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: json-simple
Bundle-SymbolicName: org.json.simple
Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: JSON Simple
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Export-Package: org.json.simple,
org.json.simple.parser
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: json-simple
Bundle-SymbolicName: org.json.simple
Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: JSON Simple
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
Export-Package: org.json.simple,
org.json.simple.parser