Merge branch 'master' into fruitiex/newpanelhud
authorRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 11:15:27 +0000 (13:15 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 11:15:27 +0000 (13:15 +0200)
commit61efc693bb60ef3fd9d34f48b377e9b2a9425b85
tree7578e451848482ff9880ecc3f924f53ae5ca968c
parent656f1c709dd47defd544c1968b64c778f66a733c
parent9996952092f9bbc39328a96a9af66f7f5ddbdd32
Merge branch 'master' into fruitiex/newpanelhud
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/main.qh
qcsrc/common/constants.qh