Merge remote-tracking branch 'origin/master' into design2015

Browse Source

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java

...

This commit is contained in:

fmittag committed 2015-03-27 14:39:21 +02:00

2 parents 255644a5da 226b2da89b

commit b29144b1a8

94 files changed

+2340 -1018

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/images/flags�af.png

BIN

Binary file not shown.