]> 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: d75a5f7 3ab7e09)
Merge branch 'master' into Mario/cursor
authorMario <mario@smbclan.net>
Mon, 25 Jun 2018 06:23:01 +0000 (16:23 +1000)
committerMario <mario@smbclan.net>
Mon, 25 Jun 2018 06:23:01 +0000 (16:23 +1000)
1  2 
qcsrc/client/hud/hud.qh patch | diff1 | diff2 | blob | history
qcsrc/client/hud/panel/radar.qc patch | diff1 | diff2 | blob | history
qcsrc/client/main.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud/hud.qh
Simple merge
diff --cc qcsrc/client/hud/panel/radar.qc
Simple merge
diff --cc qcsrc/client/main.qc
Simple merge