]> 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: 675956f 9953253)
Merge branch 'master' into martin-t/damagetext
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 24 Feb 2017 17:14:13 +0000 (18:14 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 24 Feb 2017 17:14:13 +0000 (18:14 +0100)

Trivial merge