Merge remote branch 'origin/master' into fruitiex/cl_vyes
authorFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 11:19:13 +0000 (13:19 +0200)
committerFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 11:19:13 +0000 (13:19 +0200)
commit85933809fc8288e7f0c59fb6bc4fa4d053597446
tree8b214af558483b1f9d58a64d4d17a3c265fd5fda
parent0250eeb9b9ce4f6b10d817700123d1bfd12f5789
parent7620bad4093b6d83eb360cd6c9dd80e5cb5a2a1a
Merge remote branch 'origin/master' into fruitiex/cl_vyes
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/hud.qc