]> 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: f192c14 fd881f5)
Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Fri, 14 Dec 2012 10:16:30 +0000 (11:16 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 14 Dec 2012 10:16:30 +0000 (11:16 +0100)

Trivial merge