]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/hud_code_cleanup
authorterencehill <piuntn@gmail.com>
Thu, 30 May 2013 21:27:54 +0000 (23:27 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 30 May 2013 21:27:54 +0000 (23:27 +0200)
commit9fc4bc2156cdd6d4f52c1ed6257effabf8c5d41f
tree6d83e9d3ebc86f3cb244d98b4523b099a0fa166e
parent4e25f31d58eca9fafdbcf1798bb2108e714d6c29
parent903fa71cb2f57764359c8c1435d492e2faac3d74
Merge branch 'master' into terencehill/hud_code_cleanup
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh