]> 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: e429d70 b6116d1)
Merge branch 'mirceakitsune/preview_images' of git://de.git.xonotic.org/xonotic/xonot...
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 3 Jan 2012 16:56:41 +0000 (18:56 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 3 Jan 2012 16:56:41 +0000 (18:56 +0200)

Trivial merge