]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitb6116d15c9345367b982b1d9dd13d726aff03925
treec4881361b94cc89b394a53f9a35ae13653037f41
parent7b76e69756aa48e62eaeae47d69625c9e556ab24
parent6796c18deac69d942dfc65b88efb2a5d9b258608
Merge remote branch 'origin/master' into mirceakitsune/preview_images
qcsrc/common/util.qc