 Armin Zamani
|
f13a8fc469
|
Merge branch 'master' into racecommittee_integrated
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/RegattaLeaderboardImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java
java/com.sap.sailing.gwt.ui/build.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardDescriptor.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/AbstractLeaderboardDTO.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
|
2013-02-22 15:51:13 +01:00 |
|
 Axel Uhl
|
b1ca277dab
|
added build.log to .gitignore
|
2013-02-22 04:35:42 +01:00 |
|
|
Armin Zamani
|
7498146143
|
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
Conflicts:
.gitignore
|
2013-01-23 13:44:38 +01:00 |
|
|
Armin Zamani
|
be18c655f3
|
extended gitignore for mobile gen folders
|
2013-01-23 13:35:44 +01:00 |
|
|
Armin Zamani
|
261ea70f79
|
update gitignore for glue project
|
2013-01-21 21:19:53 +01:00 |
|
 Lukas Niemeier
|
4459824cd4
|
# some ignores for bin in mobile
# some test code for deserialization
|
2013-01-21 19:43:19 +01:00 |
|
|
Lukas Niemeier
|
c847ebda4a
|
# ignores for app
|
2013-01-16 18:58:47 +01:00 |
|
|
Lukas Niemeier
|
e658c06a28
|
# clean up for ignore rules
|
2013-01-16 18:56:32 +01:00 |
|
|
Lukas Niemeier
|
a7ad251a03
|
some ignores
|
2013-01-16 18:27:51 +01:00 |
|
|
Lukas Niemeier
|
f74af14730
|
# deserialization for event, coursearea, venue
|
2013-01-16 18:04:52 +01:00 |
|
|
Lukas Niemeier
|
c24d19e284
|
# some ignores
# serialization details moved to final fields
|
2013-01-16 17:25:39 +01:00 |
|
 Lukas Niemeier
|
bbe9c1dac2
|
# added glue project to connect domain and domain.common to android apps...
|
2012-10-10 14:28:00 +02:00 |
|
 Simon Pamies
|
b1a4b05d5c
|
Added sailing_debug0* logfiles to gitignore
|
2012-07-30 13:47:26 +02:00 |
|
|
Simon Pamies
|
dff9c97edd
|
Removed all launch configurations from ignore
|
2012-07-30 13:45:50 +02:00 |
|
|
Simon Pamies
|
0566ee9a54
|
Added ignored launch configs and preferences
|
2012-07-30 13:45:50 +02:00 |
|
|
Axel Uhl
|
aba87ff6b6
|
removed launch configs from .gitignore
|
2012-07-18 13:22:47 +02:00 |
|
 Marcus Kammer
|
40d1e60a09
|
add launch config to ignore
|
2011-11-21 11:29:43 +01:00 |
|
|
Marcus Kammer
|
fe802e18c5
|
add gwt unit cache to gitignore
|
2011-11-21 11:23:45 +01:00 |
|
|
Marcus Kammer
|
ddda212f04
|
modify gitignore
|
2011-11-21 10:32:49 +01:00 |
|
|
Axel Uhl
|
88255b00aa
|
added files whose name ends with "~" to .gitignore
|
2011-07-12 11:16:32 +02:00 |
|
|
Axel Uhl
|
67c97138f7
|
added launch config for OSGi server without proxy, with tunnel
|
2011-07-04 17:57:09 +02:00 |
|
|
Axel Uhl
|
becc95ad49
|
fixed pattern that at least excludes Java .class files
|
2011-06-10 21:26:56 +02:00 |
|
|
Simon Pamies
|
edd512fb7a
|
Trying to avoid bytecode files to be shown in status - doesn't really
work but
|
2011-06-10 18:48:29 +02:00 |
|
|
Axel Uhl
|
4e795d1d1f
|
removed scalatest stuff from Java branch
|
2011-05-11 13:57:35 +02:00 |
|