]> 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: 7daf410 c15c216)
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Mon, 22 Jan 2018 20:19:30 +0000 (06:19 +1000)
committerMario <mario@smbclan.net>
Mon, 22 Jan 2018 20:19:30 +0000 (06:19 +1000)
1  2 
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/autocvars.qh
Simple merge