mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-31 16:20:45 +00:00
Axel Uhl
45deabb347
Conflicts: java/com.sap.sailing.gwt.ui/SailingGWT.launch java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/media/MediaPlayerManagerComponent.java java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java Part of the conflict resolution was to include UserManagementService and UserService in the newhome application factories to pass them to AutoPlayer
65 lines
2.4 KiB
Properties
Executable File
65 lines
2.4 KiB
Properties
Executable File
source.WEB-INF/classes/ = src/main/java,\
|
|
src/main/resources
|
|
output.WEB-INF/classes/ = bin
|
|
bin.includes = META-INF/,\
|
|
WEB-INF/classes/,\
|
|
WEB-INF/web.xml,\
|
|
AdminConsole.css,\
|
|
AdminConsole.html,\
|
|
Leaderboard.css,\
|
|
LeaderboardNewHome.css,\
|
|
Leaderboard.html,\
|
|
LeaderboardEditing.html,\
|
|
UserManagement.html,\
|
|
com.sap.sailing.gwt.ui.AdminConsole/,\
|
|
com.sap.sailing.gwt.ui.Leaderboard/,\
|
|
com.sap.sailing.gwt.ui.LeaderboardEditing/,\
|
|
com.sap.sailing.gwt.ui.UserManagement/,\
|
|
com.sap.sailing.gwt.Home/,\
|
|
com.sap.sailing.gwt.AutoPlay/,\
|
|
crossdomain.xml,\
|
|
images/,\
|
|
reset.css,\
|
|
CommonControls.css,\
|
|
RaceBoard.css,\
|
|
RaceBoard.html,\
|
|
Spectator.html,\
|
|
com.sap.sailing.gwt.ui.Spectator/,\
|
|
com.sap.sailing.gwt.ui.PolarSheets/,\
|
|
com.sap.sailing.gwt.ui.RaceBoard/,\
|
|
highcharts/,\
|
|
Spectator.css,\
|
|
fontface.css,\
|
|
fonts/,\
|
|
com.sap.sailing.gwt.ui.Simulator/,\
|
|
Simulator.html,\
|
|
Simulator.css,\
|
|
RegattaOverview.css,\
|
|
RegattaOverview.html,\
|
|
com.sap.sailing.gwt.ui.RegattaOverview/,\
|
|
com.sap.sailing.gwt.ui.VideoPopup/,\
|
|
VideoPopup.html,\
|
|
VideoPopup.css,\
|
|
com.sap.sailing.gwt.ui.YoutubePopup/,\
|
|
YoutubePopup.html,\
|
|
TvView.html,\
|
|
com.sap.sailing.gwt.ui.TvView/,\
|
|
BrowserUnsupported.html,\
|
|
PolarSheets.css,\
|
|
PolarSheets.html,\
|
|
ViewerToolbar.css,\
|
|
com.sap.sailing.gwt.ui.DataMining/,\
|
|
DataMining.css,\
|
|
DataMining.html,\
|
|
AdminConsoleDateTimePicker.css,\
|
|
qrcode/,\
|
|
js/,\
|
|
AdminConsoleProgressBar.css,\
|
|
AutoPlay.css,\
|
|
AutoPlay.html,\
|
|
Home.css,\
|
|
Home.html,\
|
|
base.css,\
|
|
com.sap.sailing.gwt.ui.Search/
|
|
output.. = WEB-INF/classes/
|