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)
commit9334cf53b0bdefd6710e84a4ba2f5e4fb97818c9
tree6246db4b48c776609a7c54fd77731ae1f041edd0
parente16769afc48942cb2e9323f0e86b090959bf36b7
parentea518929abe1464fba476eb7010698d93a5d5b6f
Merge remote branch 'origin/master' into divVerent/crypto2
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/server/cl_client.qc