Merge branch 'master' into divVerent/speedlimit
authorRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 21:24:15 +0000 (23:24 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 21:24:15 +0000 (23:24 +0200)
commit07c6b6356a0c24dcc4c3b7468728b6d96014d446
tree08305eebe0de6648cfec79d9089d89c8ab73ffe7
parentdc213549ade1b70680264a5dae999b89b55867ee
parent7fa36597fbf3333bab27dc3cdc1bb550cabfca17
Merge branch 'master' into divVerent/speedlimit
qcsrc/server/cl_physics.qc
qcsrc/server/sv_main.qc