]> 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: b38238f fd1db07)
Merge branch 'master' into sev/luma
authorSeverin Meyer <sev.ch@web.de>
Fri, 2 Jan 2015 09:47:07 +0000 (10:47 +0100)
committerSeverin Meyer <sev.ch@web.de>
Fri, 2 Jan 2015 09:47:07 +0000 (10:47 +0100)

Trivial merge