D049941 983201e04a Merge remote-tracking branch 'external/master' into riccardo ...

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/pages/TracTracEventManagementPanel.java

2013-10-24 15:52:16 +02:00

..

.settings

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

2013-10-24 15:52:16 +02:00

META-INF

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

2013-10-24 15:52:16 +02:00

src/com/sap/sailing/velum/resultimport

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

2013-10-24 15:52:16 +02:00

.classpath

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

2013-10-24 15:52:16 +02:00

.gitignore

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

2013-10-24 15:52:16 +02:00

.project

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

2013-10-24 15:52:16 +02:00

build.properties

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

2013-10-24 15:52:16 +02:00

pom.xml

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

2013-10-24 15:52:16 +02:00