Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Fri, 16 Jul 2010 00:19:55 +0000 (02:19 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 16 Jul 2010 00:19:55 +0000 (02:19 +0200)
commit8433a77e9e8d1987ce1a473385a3f8c5306bc9c7
tree49c3df17280c1bd4a2883d599be802ff8245e48b
parent1a29e974c56307b2d9127237e3b02c38de4724fe
parent4ee3fa93b7db7e6c50779878276bbb0f43129492
Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud
defaultXonotic.cfg