Files
sailing-analytics/java/com.sap.sailing.gwt.ui/.gitignore
T
Benjamin Ebling d46376eb40 Merge branch 'master' into usermanagement
Conflicts:
	java/com.sap.sailing.gwt.ui/.gitignore
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/panels/UserStatusPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVViewController.java
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
2014-06-04 15:49:02 +02:00

8 lines
103 B
Plaintext
Executable File

/bin
/.gwt
/.generated
/gwt-unitCache
/extras
/com.sap.sailing.gwt.*
/com.sap.sse.security.ui.*