Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Sun, 10 Oct 2010 19:57:37 +0000 (21:57 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 10 Oct 2010 19:57:37 +0000 (21:57 +0200)
commitcc32d8e4288a70b77c61208820e93d3fad56fcdf
treebb228facc4929397079ef3a0455758ced2c88ab6
parent4a87beeaa7c282a8473af3c95f77be3e09c8fb6e
parent049a3349de147807768f5b6e89a53c09c5249282
Merge branch 'master' into terencehill/newpanelhud
defaultXonotic.cfg
qcsrc/client/View.qc