]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/mirceakitsune/preview_images'
authorSamual <samual@xonotic.org>
Sat, 7 Jan 2012 19:39:16 +0000 (14:39 -0500)
committerSamual <samual@xonotic.org>
Sat, 7 Jan 2012 19:39:16 +0000 (14:39 -0500)
commitc5d2e002cfd511eaf1b1267ab49cd90161f08052
tree84b6732dbd14289e126631ab285e485964ebb71d
parent0e67812b8a87ec28effd40a8f0c3afe8d39cb72f
parent2241d30e0f85d32a4030fe3980b89513bbe32cac
Merge remote branch 'origin/mirceakitsune/preview_images'