Merge branch 'master' into terencehill/essential_weapons_panel
authorterencehill <piuntn@gmail.com>
Tue, 24 May 2011 22:34:29 +0000 (00:34 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 24 May 2011 22:34:29 +0000 (00:34 +0200)
commit9533251c17521a8446265c8924ec3e68f1232690
treeadfac5dab350ffb8f9ddd25a2ded1cf742cee9c1
parent07504423903fd6c6ec9d47bfd0ff2eb34a042a8c
parent1ed620d16c68ee54ca7c97688b07932265c343dc
Merge branch 'master' into terencehill/essential_weapons_panel
defaultXonotic.cfg
qcsrc/client/hud.qc