]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Fri, 13 Mar 2015 11:20:43 +0000 (22:20 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 13 Mar 2015 11:20:43 +0000 (22:20 +1100)
commit3b552b6aeec67a91de72f02272440cbeea3a828b
tree1bca17dc691630d375ea1ac072edd52b37d7a3ad
parentfeb970c673ec3117321754fad37a6552c28ab582
parentcbe6743ef05c17d65ab5e0733b69e1d1c350764c
Merge branch 'master' into Mario/combined_updates

Conflicts:
qcsrc/server/defs.qh
qcsrc/client/hud.qc
qcsrc/server/cl_client.qc
qcsrc/server/command/vote.qc
qcsrc/server/defs.qh
qcsrc/server/func_breakable.qc
qcsrc/server/g_world.qc