Merge branch 'design2015-competition' into design2015

Browse Source

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties

...

This commit is contained in:

Benjamin Barth committed 2015-08-14 10:34:36 +02:00

2 parents 9fe6ce5b12 172a602b96

commit 006ff3b0f0

31 files changed

+518 -315

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/home/skip-forward.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.0 KiB