Merge remote branch 'origin/master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Fri, 15 Oct 2010 13:16:19 +0000 (15:16 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 15 Oct 2010 13:16:19 +0000 (15:16 +0200)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/server/cl_client.qc

Simple merge
Simple merge
Simple merge