projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac5b1ea 42847fd)
Merge branch 'master' into martin-t/msnt 383/head
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 6 Nov 2016 14:47:13 +0000 (15:47 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 6 Nov 2016 14:47:13 +0000 (15:47 +0100)

Trivial merge