]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Tue, 31 Mar 2015 15:41:07 +0000 (02:41 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 31 Mar 2015 15:41:07 +0000 (02:41 +1100)
commit0079b1ee738754ef8d422641eae641b1a853d8d6
tree4b1e74c4b695129543a084421bab1964b61b4246
parent08d0eefd932de38e3e1c496bd33023bdc3ed8a57
parent4b7122341c061db67741ab0e05bdabcc0d24c3d0
Merge branch 'master' into Mario/combined_updates

Conflicts:
qcsrc/server/mutators/mutator_instagib.qc
qcsrc/client/view.qc
qcsrc/server/autocvars.qh
qcsrc/server/mutators/mutator_nades.qc