Merge branch 'Mario/cursor' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 21 Sep 2018 02:19:30 +0000 (02:19 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 21 Sep 2018 02:19:30 +0000 (02:19 +0000)
commite3cce38a477f7cb7f6da52a1347c68c1bc55ea49
tree194fbe5b73c8558f00cad89331520f5f31872491
parentb3543a711c64092c949e743fe2e086b62a279491
parente044c33d2e56a13837659b0cdb0ac9a2e6242957
Merge branch 'Mario/cursor' into 'master'

Merge branch Mario/cursor (M merge request)

Closes #1128

See merge request xonotic/xonotic-data.pk3dir!570
qcsrc/client/main.qc
qcsrc/client/view.qc