Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Thu, 14 Oct 2010 22:40:40 +0000 (00:40 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 14 Oct 2010 22:40:40 +0000 (00:40 +0200)
commit1d3adc69b6b41927e8a338d02451695128388efc
tree5446b3cf1e04796218adcf21d870c6dd2909fe28
parenta9aa85e45a4e148d74ca5b27675ce5368a7cde72
parent13ef1ff574dfa739e5c768d5dabaeed6dce7ad17
Merge branch 'master' into terencehill/newpanelhud

Conflicts:
defaultXonotic.cfg
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/hud.qc