]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/menu_updates
authorSamual <samual@xonotic.org>
Fri, 20 Jan 2012 00:48:52 +0000 (19:48 -0500)
committerSamual <samual@xonotic.org>
Fri, 20 Jan 2012 00:48:52 +0000 (19:48 -0500)
commit35a27cda61401d3d1af6782ee9c4661c7280f7ad
tree220f876c87b9dd1d3a634a7b42ff163749a06248
parentb06eb3808fe52657e5ad6b5d276c8b8a2c30c63f
parentef0b1804069b8d29084bb863197b371457e669c1
Merge remote branch 'origin/master' into samual/menu_updates
qcsrc/client/View.qc