Merge branch 'master' into dev

This commit is contained in:
Axel Uhl (Server) committed 2013-02-22 11:46:31 +01:00
commit cb58a96acc
3 files changed
+6 -1

No files matched your search

+1
View File
@@ -1,4 +1,5 @@
/target
build.log
.metadata
*.class
*.swp
+4 -1
View File
@@ -2,7 +2,10 @@
# this holds for default installation
USER_HOME=~
PROJECT_HOME=$USER_HOME/git
echo PROJECT_HOME is $PROJECT_HOME
if [ "$PROJECT_HOME" = "" ]; then
PROJECT_HOME=$USER_HOME/git
fi
SERVERS_HOME=$USER_HOME/servers
# x86 or x86_64 should work for most cases
@@ -24,6 +24,7 @@ bin.includes = META-INF/,\
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,\