]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/less_entities
authorterencehill <piuntn@gmail.com>
Sun, 11 Aug 2019 13:41:17 +0000 (15:41 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 11 Aug 2019 13:41:17 +0000 (15:41 +0200)
commite2ac9a1c46a87b77bce234dd1655d0a026accc61
tree04dfa6ef92b16889579e856dd9a098871f985db0
parent6b23441a09df29b9c5c5679c00b625ebf38ee5b9
parent3f151f4a5037c6d7c9eb6812b9dc5b5b4c706872
Merge branch 'master' into terencehill/less_entities
qcsrc/common/gamemodes/gamemode/assault/sv_assault.qc
qcsrc/common/mutators/mutator/nades/nades.qc