Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge

Browse Source

# Conflicts:
#	src/main/resources/views/RaceView.fxml

...

This commit is contained in:

Alistair McIntyre

2017-09-14 14:42:57 +12:00

parent 3a41c27d8d acd0e790fe

commit 33779ad5c1

3 changed files with 22 additions and 38 deletions

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

src/main/resources/images/wind-180.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 28 KiB After Width:  |  Height:  |  Size: 26 KiB