]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Sat, 20 Oct 2018 03:48:17 +0000 (13:48 +1000)
committerMario <mario@smbclan.net>
Sat, 20 Oct 2018 03:48:17 +0000 (13:48 +1000)
commita3cf497caaf1b3e7e07d9d1e4051bf9ae2e55eca
treeaced5a7a0ab22d930968e3308ff605228982721b
parent4e6e4a8380fce09e9024e571ee3c9de10893639f
parent0aa7cb88f50114ef8b87f7b7e2efc07641ee050f
Merge branch 'master' into Mario/monsters

# Conflicts:
# qcsrc/common/mapinfo.qh
qcsrc/common/mapinfo.qh
qcsrc/server/autocvars.qh