]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3543a7 e044c33)
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)
Merge branch Mario/cursor (M merge request)

Closes #1128

See merge request xonotic/xonotic-data.pk3dir!570

1  2 
qcsrc/client/main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/main.qc
Simple merge
diff --cc qcsrc/client/view.qc
Simple merge