]> 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: b801043 f25d8b1)
Merge branch 'master' into martin-t/msnt
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 28 Oct 2016 18:58:49 +0000 (20:58 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 28 Oct 2016 18:58:49 +0000 (20:58 +0200)

Trivial merge