]> 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: 3389f6a 1abbb17)
Merge branch 'terencehill/servers_quickmenu' into 'master'
authorterencehill <piuntn@gmail.com>
Fri, 16 Sep 2022 14:50:10 +0000 (14:50 +0000)
committerterencehill <piuntn@gmail.com>
Fri, 16 Sep 2022 14:50:10 +0000 (14:50 +0000)
Custom server's quickmenu

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

1  2 
qcsrc/client/hud/panel/quickmenu.qc patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/client.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud/panel/quickmenu.qc
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge
diff --cc qcsrc/server/client.qh
Simple merge