]> 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: 102d1e9 29ba411)
Merge branch 'master' into martin-t/defaults
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 19 Jul 2017 13:55:20 +0000 (15:55 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 19 Jul 2017 13:55:20 +0000 (15:55 +0200)

Trivial merge