]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/ctf_updates
authorMario <zacjardine@y7mail.com>
Sun, 3 May 2015 14:43:37 +0000 (00:43 +1000)
committerMario <zacjardine@y7mail.com>
Sun, 3 May 2015 14:43:37 +0000 (00:43 +1000)
commit34195feabdbcec29f6b7f6fcf8df8e25c4f41d8a
tree05629650e9e8783832bdb5bd277eaf9ac5b9331b
parentec84f4c57e111e5d2b04d27d2de393cd6a3250a2
parent51556c68ea3024fc22a9a38e0d0d72e5107e2d60
Merge branch 'master' into Mario/ctf_updates

Conflicts:
qcsrc/client/hud.qc
qcsrc/server/autocvars.qh
qcsrc/client/hud.qc
qcsrc/server/autocvars.qh