]> 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: c58d286 e99ea76)
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Mon, 5 Mar 2018 13:32:17 +0000 (23:32 +1000)
committerMario <mario@smbclan.net>
Mon, 5 Mar 2018 13:32:17 +0000 (23:32 +1000)
1  2 
qcsrc/menu/xonotic/util.qc patch | diff1 | diff2 | blob | history
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/menu/xonotic/util.qc
Simple merge
diff --cc qcsrc/server/autocvars.qh
Simple merge