Merge branch 'master' into tw2015

Browse Source

Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch

...

This commit is contained in:

Axel Uhl committed 2015-07-13 16:49:59 +02:00

2 parents f513d6ded4 7849cab0d5

commit 16e7ba3a81

6 files changed

+20 -17

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/SailingGWT.launch

Executable → Regular

File mode changed.