]> 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: b518338 95888e3)
Merge branch 'master' into Mario/cursor
authorterencehill <piuntn@gmail.com>
Tue, 18 Sep 2018 12:02:25 +0000 (14:02 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 18 Sep 2018 12:02:25 +0000 (14:02 +0200)
1  2 
qcsrc/client/hud/panel/quickmenu.qc patch | diff1 | diff2 | blob | history
qcsrc/client/main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history

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