]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/gamemode_composition 244/head
authorTimePath <andrew.hardaker1995@gmail.com>
Fri, 23 Oct 2015 03:57:11 +0000 (14:57 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Fri, 23 Oct 2015 03:57:11 +0000 (14:57 +1100)
commit5bbfb59ff40eca7824c231d687c2bf587a01749d
tree05d81a90b27ee145c67a0f98dbf27d6b6edd8f24
parentad83c89d457b02e664603b68b68c27005a1d9dc5
parentb3260e6459878fa018739f93d6aee412b64472d5
Merge branch 'master' into TimePath/gamemode_composition

# Conflicts:
# qcsrc/common/mapinfo.qh
# qcsrc/server/mutators/events.qh
# qcsrc/server/mutators/mutator/sandbox.qc
12 files changed:
defaultXonotic.cfg
qcsrc/common/mapinfo.qh
qcsrc/menu/menu.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/miscfunctions.qh
qcsrc/server/mutators/events.qh
qcsrc/server/mutators/mutator/sandbox.qc
qcsrc/server/t_items.qc
qcsrc/server/weapons/weaponsystem.qc