]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Fri, 12 Oct 2018 08:14:44 +0000 (18:14 +1000)
committerMario <mario@smbclan.net>
Fri, 12 Oct 2018 08:14:44 +0000 (18:14 +1000)
commit988ea12f5b942f5f55c32f4a3c5ccc25b438e73b
tree9449df22c0b3bebf80d7984fe6736d9c472c147a
parent4f2ab9ff88e931c7b38e6ad9ad6b36479a686f2c
parent1065c8d215b91408a7f70ae76546e70675885cff
Merge branch 'master' into Mario/monsters

# Conflicts:
# qcsrc/menu/xonotic/util.qc
qcsrc/client/csqcmodel_hooks.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/common/turrets/sv_turrets.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/autocvars.qh