]> 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: 3aa63c6 373da6f)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorJan Behrens <zykure@web.de>
Tue, 29 Jan 2013 19:36:47 +0000 (20:36 +0100)
committerJan Behrens <zykure@web.de>
Tue, 29 Jan 2013 19:36:47 +0000 (20:36 +0100)

Trivial merge