]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7ee5fd 0e67812)
Merge remote branch 'origin/master' into mirceakitsune/preview_images
authorSamual <samual@xonotic.org>
Sat, 7 Jan 2012 19:38:23 +0000 (14:38 -0500)
committerSamual <samual@xonotic.org>
Sat, 7 Jan 2012 19:38:23 +0000 (14:38 -0500)

Trivial merge