]> git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3d3ddc ad6b3f8)
Merge remote branch 'origin/master' into mirceakitsune/preview_images
authorSamual <samual@xonotic.org>
Tue, 3 Jan 2012 16:44:07 +0000 (11:44 -0500)
committerSamual <samual@xonotic.org>
Tue, 3 Jan 2012 16:44:07 +0000 (11:44 -0500)

Trivial merge