]> 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: 78f4520 2edf2d6)
Merge commit '2edf2d628ab52514ab531976ee8b06479e56ace7'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 13 Aug 2012 07:11:44 +0000 (09:11 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 13 Aug 2012 07:11:44 +0000 (09:11 +0200)

Trivial merge