]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into divVerent/force_colors_teamplay
authorRudolf Polzer <divverent@alientrap.org>
Sat, 21 Jul 2012 19:11:50 +0000 (21:11 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 21 Jul 2012 19:11:50 +0000 (21:11 +0200)
commit770fcdb94523646b4869e658ecd3750aa9c693b7
tree303ec8422717d2fb95e98c2a38a2a88caa304a80
parentff8f055977a76ac23ea29b456fa461bfab7343e2
parent16d1fe1b83453c783d48c564fab0758f03592c71
Merge remote-tracking branch 'origin/master' into divVerent/force_colors_teamplay
qcsrc/client/csqcmodel_hooks.qc