Merge branch 'master' into terencehill/newpanelhud
authorFruitieX <rasse@rasse-laptop.(none)>
Thu, 21 Oct 2010 18:40:17 +0000 (21:40 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Thu, 21 Oct 2010 18:40:17 +0000 (21:40 +0300)
commitfe8c7510919a64ff76afde8eb94bbb29bf293c3b
tree59c2885e9592bd051ec0c9a7396f04b6933f4c4b
parentd0642be2e21e2a63ec63437fea3f6b37e6af70d4
parent0772c3b29fd3bcec712093f3ec471fa57fb8770f
Merge branch 'master' into terencehill/newpanelhud
defaultXonotic.cfg
qcsrc/client/View.qc