Merge branch 'solutions'

Browse Source

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/partials/solutions/Solutions.ui.xml

...

This commit is contained in:

Benjamin Barth committed 2015-11-12 16:14:52 +01:00

2 parents 5d0292573e 5d0b189440

commit e6c8c77c63

30 files changed

+924 -338

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/solutions-post-trimmed.png

BIN

Binary file not shown.

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

java/com.sap.sailing.gwt.ui/images/home/solutions-post.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 10 KiB After Width:  |  Height:  |  Size: 12 KiB

java/com.sap.sailing.gwt.ui/images/home/solutions-sap-in-sailing.jpg

BIN

Binary file not shown.

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

java/com.sap.sailing.gwt.ui/images/home/solutions-sap-sailing-race-manager.png

BIN

Binary file not shown.

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

java/com.sap.sailing.gwt.ui/images/home/solutions-sap-trimmed.png

BIN

Binary file not shown.

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

java/com.sap.sailing.gwt.ui/images/home/solutions-sap.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 233 KiB After Width:  |  Height:  |  Size: 187 KiB

java/com.sap.sailing.gwt.ui/images/home/solutions-simulator-trimmed.png

BIN

Binary file not shown.

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

java/com.sap.sailing.gwt.ui/images/home/solutions-simulator.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 286 KiB After Width:  |  Height:  |  Size: 311 KiB

java/com.sap.sailing.gwt.ui/images/home/solutions-training.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 27 KiB After Width:  |  Height:  |  Size: 612 KiB

java/com.sap.sailing.gwt.ui/images/mobile/solutions-post.png

BIN

Binary file not shown.

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

java/com.sap.sailing.gwt.ui/images/mobile/solutions-race.png

BIN

Binary file not shown.

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

java/com.sap.sailing.gwt.ui/images/mobile/solutions-sap-in-sailing.jpg

BIN

Binary file not shown.

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

java/com.sap.sailing.gwt.ui/images/mobile/solutions-sap-trimmed.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 236 KiB After Width:  |  Height:  |  Size: 179 KiB

java/com.sap.sailing.gwt.ui/images/mobile/solutions-sap.png

BIN

Binary file not shown.

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

java/com.sap.sailing.gwt.ui/images/mobile/solutions-simulator.png

BIN

Binary file not shown.

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

java/com.sap.sailing.gwt.ui/images/mobile/solutions-training.png

BIN

Binary file not shown.

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