]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into mirceakitsune/preview_images
authorSamual <samual@xonotic.org>
Tue, 3 Jan 2012 16:44:59 +0000 (11:44 -0500)
committerSamual <samual@xonotic.org>
Tue, 3 Jan 2012 16:44:59 +0000 (11:44 -0500)
1  2 
qcsrc/common/util.qc

Simple merge