]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Sat, 25 Apr 2015 04:52:16 +0000 (14:52 +1000)
committerMario <zacjardine@y7mail.com>
Sat, 25 Apr 2015 04:52:16 +0000 (14:52 +1000)
commit062395ee2aec81c6a30893f514e52cdb78d4a9d2
treecc4c00192854d1ae53ba63ea5e4841882c1583b4
parent8a00716b4bee3601fdcc0ef519e61c85be750120
parentc8f42a86f88feeddfd5d80f58e0b5155b549b626
Merge branch 'master' into Mario/combined_updates

Conflicts:
qcsrc/client/hud.qc
qcsrc/common/weapons/weapons.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/vehicles/racer.qc
qcsrc/client/hud.qc
qcsrc/common/weapons/weapons.qc
qcsrc/common/weapons/weapons.qh
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/t_items.qc
qcsrc/server/t_items.qh
qcsrc/warpzonelib/server.qc