Merge branch 'master' into DefaultUser/waypoint_icons
authorMario <mario@smbclan.net>
Wed, 7 Feb 2018 09:18:46 +0000 (19:18 +1000)
committerMario <mario@smbclan.net>
Wed, 7 Feb 2018 09:18:46 +0000 (19:18 +1000)
commitd6a328a053a17934147baf67fe01c5719bbf7388
treeb9247f20024f80147026214a4a5f66aa827f187d
parentc11ec1916be586704cd822dc3356273cf7de839d
parent55e756c1955737b8b3add2fb86cdb0c8c749e70f
Merge branch 'master' into DefaultUser/waypoint_icons