Commit Graph
5 Commits
Author SHA1 Message Date
Axel Uhl 5aaecdeb10 renamed GWT test case launches and provided a launch for the no-proxy set-up 2013-12-06 13:38:50 +01:00
Armin Zamani b501d1ca6f Merge branch 'racecommittee_integrated' of
ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
2013-04-11 00:28:12 +02:00
Axel Uhl c972c9e3d1 Merge branch 'gwt' into osgi_mvn_refactoring
Conflicts:
	java/com.sap.sailing.gwt.ui.test/.gitignore
	java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.api/.project
	java/com.sap.sailing.server.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
2011-12-28 15:37:10 +01:00
fmittag 86f8236dbc add missing .gitignore files 2011-12-13 11:58:28 +01:00
Axel Uhl 8a0c5f4112 added a .gitignore 2011-12-12 20:07:01 +01:00