]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into mirceakitsune/func_train_beizer_curve
authorRudolf Polzer <divverent@xonotic.org>
Thu, 24 May 2012 08:41:01 +0000 (10:41 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 24 May 2012 08:41:01 +0000 (10:41 +0200)
1  2 
qcsrc/server/g_subs.qc

Simple merge