Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Thu, 12 May 2011 20:14:28 +0000 (22:14 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 12 May 2011 20:14:28 +0000 (22:14 +0200)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/main.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge