]> 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: 91be51a c4e0c3f)
Merge branch 'master' into martin-t/defaults
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 25 Jul 2017 23:49:38 +0000 (01:49 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 25 Jul 2017 23:49:38 +0000 (01:49 +0200)

Trivial merge