]> de.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: 317ec3e 1e41fbb)
Merge branch 'terencehill/quickmenu_file_example' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 8 Nov 2015 08:28:35 +0000 (08:28 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 8 Nov 2015 08:28:35 +0000 (08:28 +0000)
Quickmenu file example

See merge request !249

1  2 
qcsrc/client/commands/cl_cmd.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/commands/cl_cmd.qc
Simple merge