Axel Uhl 211d1f9844 Merge branch 'master' into gwt25 ...

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactWindImpl.java
	java/com.sap.sailing.operationaltransformation/bin/com/sap/sailing/operationaltransformation/package.html

2013-01-09 17:16:07 +01:00

..

docs

renamed from runlet to sailing

2012-03-26 21:07:10 +02:00

META-INF

added lazy activation policy to all bundles (except the test bundles).

2012-07-03 14:10:59 +02:00

src/com/sap/sailing/operationaltransformation

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

.classpath

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

.gitignore

added missing .gitignore files in com.sap.sailing.operationaltransformation bundles

2012-05-03 13:54:30 +02:00

.project

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

build.properties

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

OperationalTransformationTest.launch

Merge branch 'master' into 'gwt25'

2012-11-22 15:43:03 +01:00

pom.xml

added operational transformation stuff to pom.xml hierarchy for central build

2012-03-26 21:20:30 +02:00