]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/deathtypes
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 8 Oct 2015 05:09:36 +0000 (16:09 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 8 Oct 2015 05:09:36 +0000 (16:09 +1100)
commit9231345bfc303d3e7d9bd8a2df62e5aa26327638
treec9b3e24d322e7867113013d0c2cf297c057116e6
parent3589bb7872babf0ee489a54c85c9213562c1ffe9
parent81b0f2bc5760bb652515453ac450f2822a98b725
Merge branch 'master' into TimePath/deathtypes

# Conflicts:
# qcsrc/common/util-pre.qh
qcsrc/client/hud.qc
qcsrc/client/main.qc
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
qcsrc/common/util.qc
qcsrc/common/vehicles/sv_vehicles.qc
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/mutator_buffs.qc
qcsrc/server/t_items.qc
qcsrc/server/teamplay.qc