Merge branch 'master' into terencehill/essential_weapons_panel
authorterencehill <piuntn@gmail.com>
Wed, 13 Jul 2011 20:30:13 +0000 (22:30 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 13 Jul 2011 20:30:13 +0000 (22:30 +0200)
commitdc3538ad5afba59f36a79011ec6997553c851c25
treeab3d75e6eed44924d1410bf58e84ace19e1e2b86
parente4850e6d83fb795a1c5d9a12d8bafa9abf8f0b39
parent8d3a4480eb76c3462430ff6e3688b65fe88d6d1b
Merge branch 'master' into terencehill/essential_weapons_panel
defaultXonotic.cfg