]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Sat, 14 Feb 2015 13:13:03 +0000 (00:13 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 14 Feb 2015 13:13:03 +0000 (00:13 +1100)
commit511c0ca0c3ac7ff3fb1f77230ed257949d040de0
tree202fc3fb8d20f008da9e28a4ad75f2b4fbeb9c06
parenta857ea1d0ff2828204c06954618721a48c85c17c
parentab627cfdaf4471d36df58a771b2dac1ff24e9de9
Merge branch 'master' into Mario/combined_updates
qcsrc/client/hud.qc