Files
sailing-analytics/java/com.sap.sailing.selenium.test/META-INF
D049941 ea47512811 Merge branch 'master' into riccardo-selenium
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractEventManagementPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TracTracEventManagementPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedRacesListComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/panels/AbstractFilterablePanel.java
	java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.selenium.test/com.sap.sailing.selenium.test (No
Proxy, GWT Codesvr).launch
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/pages/AdminConsolePage.java
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/pages/FlexibleLeaderboardCreationDialog.java
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/pages/LeaderboardConfigurationPanel.java
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/pages/TracTracEventManagementPanel.java
	java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/gwt/widgets/CellTable.java
	java/org.openqa.selenium.osgi/build.properties
	java/org.openqa.selenium.osgi/selenium-java-2.39.0.jar
2014-02-11 09:39:27 +01:00
..