]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/physics_panel_updates
authorterencehill <piuntn@gmail.com>
Mon, 3 Oct 2011 09:34:27 +0000 (11:34 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 3 Oct 2011 09:34:27 +0000 (11:34 +0200)
commitbe85be6dad6016ed7d50ae5b7f8e5e4057692e8b
treea6acff6f542bf55cc24e1d545273a13cae370276
parent467d9604cd4033e17935c73528d2c43a086c0f61
parent93d9ec19ea9e08ad5d888351e1b6ef9de7364050
Merge branch 'master' into terencehill/physics_panel_updates
defaultXonotic.cfg
qcsrc/client/hud.qc