]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Wed, 26 Oct 2011 01:00:39 +0000 (21:00 -0400)
committerSamual <samual@xonotic.org>
Wed, 26 Oct 2011 01:00:39 +0000 (21:00 -0400)
commit7a583d34d6bce12e570e169b3c7e364638160b8f
tree4c4baf13db62c5eeff07f3bc5b9933fff7aaa77e
parent0105b7ade50bf1876b889bd0c1be870db49bc965
parent2c686bbd1fd1ac6839152d0993e6454b7c683c13
Merge remote branch 'origin/master' into samual/hud_updates
qcsrc/client/Main.qc