]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into mirceakitsune/preview_images
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 3 Jan 2012 16:43:59 +0000 (18:43 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 3 Jan 2012 16:43:59 +0000 (18:43 +0200)
1  2 
qcsrc/common/util.qc

Simple merge