]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: e23e7ec e63ba76)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorJan Behrens <zykure@web.de>
Fri, 10 May 2013 13:54:52 +0000 (15:54 +0200)
committerJan Behrens <zykure@web.de>
Fri, 10 May 2013 13:54:52 +0000 (15:54 +0200)

Trivial merge