]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit58491bb25833ac8ac6d3045e05027129309fda59
tree6f1ba53cd0010d74af96c680afe4a3fe86fed817
parentc58d2863658bf59d39da64d847170b9ef94846fb
parente99ea76598f37732b7b12924508c3f896d3749ad
Merge branch 'master' into Mario/monsters
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh