Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Wed, 24 Nov 2010 14:15:08 +0000 (15:15 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 24 Nov 2010 14:15:08 +0000 (15:15 +0100)
commit78c8c5ce2c81599cde866c96db13ef896c691387
treecab9d64398ab449b8d1f97fd1fc01ef7a5cc9bae
parent6563bdace0fcb06368998334a6f754f46a131907
parentf33228c8d6942a31797bef70de81c3bc6bc1aecc
Merge branch 'master' into terencehill/newpanelhud
defaultXonotic.cfg