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

..

createLocalBaseP2repository.sh

Added role management and login panel

2014-05-27 17:04:45 +02:00

createLocalBaseP2repositoryLinux.sh

Fixed line ending problem

2013-08-15 23:16:48 +02:00

uploadRepositoryToServer.sh

fixed target platform upload script for adjusting permissions ($-sign missing for variable dereference)

2014-06-03 23:48:01 +02:00