]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge commit 'origin/diabolik/iqmsupport'
authorRudolf Polzer <rpolzer@grawp.(none)>
Sun, 28 Mar 2010 18:51:56 +0000 (20:51 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Sun, 28 Mar 2010 18:51:56 +0000 (20:51 +0200)
1  2 
qcsrc/server/cl_client.qc

Simple merge