Steffen Schaefer ab19b81b98 Merge branch 'master' into bug3529 ...

Conflicts:
	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/RaceTableWrapper.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupOverviewPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java

2017-04-06 13:19:12 +02:00

..

.settings

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

2016-07-26 19:30:16 +02:00

fonts

…

gifs

…

highcharts/js

…

images

…

js

…

META-INF

Merge branch 'master' into bug2447

2016-12-05 17:10:22 +01:00

src/main/java/com/sap/sailing/dashboards/gwt

Merge branch 'master' into bug3529

2017-04-06 13:19:12 +02:00

WEB-INF

solved master merge conflicts in RaceBoardPanel

2016-02-18 10:28:59 +01:00

.classpath

Fixed project settings for empty resources folder

2017-02-14 11:29:09 +01:00

.gitignore

…

.project

…

build.properties

Removed entry in build.properties poiting to resources

2017-02-14 11:32:56 +01:00

pom.xml

…

RibDashboard.css

changed design of page indicator dots

2016-02-15 16:17:19 +01:00

RibDashboard.html

…

SailingDashboardsGWT sdm.launch

Fixed project settings for empty resources folder

2017-02-14 11:29:09 +01:00

SailingDashboardsGWT.launch

Setting consistent ports for DevMode launch configurations to make

2017-03-28 10:04:20 +02:00