]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/lightning_gun
authorSamual <samual@xonotic.org>
Wed, 9 Mar 2011 15:45:36 +0000 (10:45 -0500)
committerSamual <samual@xonotic.org>
Wed, 9 Mar 2011 15:45:36 +0000 (10:45 -0500)
commit0f791cb11ece60f74e804fac7d21c738deff448b
tree306e4257ec1c9dd8aad68b5de704604e5e85a318
parent618d270aedda0da359a26855feb0c55ec4767afe
parent1c4428c0df8663ee7ca675fb6ebfe9d83949c3be
Merge remote branch 'origin/master' into samual/lightning_gun
qcsrc/client/hud.qc