]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into mirceakitsune/universal_reload_system
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 10 Mar 2011 14:09:50 +0000 (16:09 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 10 Mar 2011 14:09:50 +0000 (16:09 +0200)
1  2 
qcsrc/server/miscfunctions.qc

Simple merge