Merge branch 'master' into samual/keepaway
authorFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 14:43:29 +0000 (16:43 +0200)
committerFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 14:43:29 +0000 (16:43 +0200)
commitcbd704027b098da73f32298f43a1ecbc95e485d2
treee6d4dfb6734fcaf0f2ca876188efd88dc2c4b897
parent5ad3d2aadbd5aa4fe80008df07e1f396ca1c832a
parent7620bad4093b6d83eb360cd6c9dd80e5cb5a2a1a
Merge branch 'master' into samual/keepaway
defaultXonotic.cfg
qcsrc/client/hud.qc