D049941 9c3c8cfaf3 Merge branch 'riccardo' into 'master-for-merge' ...

Conflicts:
	java/com.sap.sailing.domain.igtimiadapter.persistence/src/com/sap/sailing/domain/igtimiadapter/persistence/impl/DomainObjectFactoryImpl.java

2013-12-09 13:00:58 +01:00

..

.settings

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

META-INF

Merge branch 'master' into riccardo2

2013-12-05 12:30:46 +01:00

src/com/sap/sailing/server

Merge branch 'riccardo' into 'master-for-merge'

2013-12-09 13:00:58 +01:00

.classpath

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

.gitignore

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

.project

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

build.properties

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

pom.xml

Merge branch 'racecommittee_integrated' of

2013-04-11 00:28:12 +02:00

SailingServer (No Proxy, Jetty on 8889, Monitoring).launch

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

2013-11-22 16:15:07 +01:00

SailingServer (No Proxy, Jetty on 8889).launch

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

2013-11-22 16:15:07 +01:00

SailingServer (No Proxy, No Tests).launch

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

2013-11-22 16:15:07 +01:00

SailingServer (No Proxy, Remote Debug SAP VM).launch

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

2013-11-22 16:15:07 +01:00

SailingServer (No Proxy).launch

offer system properties to configure Igtimi client ID, secret and redirect URI

2013-11-29 15:57:14 +01:00

SailingServer (Proxy, Jetty on 8889).launch

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

2013-11-22 16:15:07 +01:00

SailingServer (Proxy, Remote Debug SAP VM).launch

added apache logging, httpclient and httpcore to all launch configurations

2013-11-20 11:11:01 +01:00

SailingServer (Proxy, SwissTiming Live Simulation).launch

added apache logging, httpclient and httpcore to all launch configurations

2013-11-20 11:11:01 +01:00

SailingServer (Proxy).launch

offer system properties to configure Igtimi client ID, secret and redirect URI

2013-11-29 15:57:14 +01:00