]> 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: 915e94f 37690e8)
Merge branch 'master' into martin-t/dmgtext
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 15 Feb 2018 10:20:56 +0000 (11:20 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 15 Feb 2018 10:20:56 +0000 (11:20 +0100)

Trivial merge