]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit82181d42e39d3d249e927e7c4922b417a102101d
tree2182797357ad5c9f91220dfb49c0d492a21f40eb
parent7daf410c0bea849bf58033ffd7f5cbd38515b11b
parentc15c2164a8c1fd8646fce81bd990b4b55f3975d1
Merge branch 'master' into Mario/monsters
qcsrc/server/autocvars.qh