Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@xonotic.org>
Fri, 9 Dec 2011 21:15:01 +0000 (22:15 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 9 Dec 2011 21:15:01 +0000 (22:15 +0100)
commit177108e231103716364491bcf2eb8f295931fe7d
tree6a0983f9019c6d8e9e8ab008a8f6d6ab6ff561ce
parent73ea0b5a120e6d4ae96ea8e01906c0a62bd92b7a
parent315d0f398d5814c2a4351da2d53f064735620e88
Merge branch 'master' into divVerent/csqcmodel
defaultXonotic.cfg
qcsrc/server/cl_client.qc