]> 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: 82507d5 478de1b)
Merge remote-tracking branch 'origin/mirceakitsune/sandbox'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 5 Dec 2011 13:11:43 +0000 (14:11 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 5 Dec 2011 13:11:43 +0000 (14:11 +0100)

Trivial merge