]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Wed, 25 Mar 2015 03:34:59 +0000 (14:34 +1100)
committerMario <zacjardine@y7mail.com>
Wed, 25 Mar 2015 03:34:59 +0000 (14:34 +1100)
commit21a31973908c422ad9317bc8b3b6e295697e6515
treeeb55eccac01db8cc03a147af4df36ee947202a86
parent284effca5269233d9efb083eaba0c216398bea8a
parentf746573dff0cedc83aa8254751fe0e6d829efc93
Merge branch 'master' into Mario/combined_updates
defaultXonotic.cfg
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/common/weapons/w_shockwave.qc
qcsrc/server/command/cmd.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/mutator_overkill.qc
qcsrc/warpzonelib/server.qc
qcsrc/warpzonelib/util_server.qc