]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6924dba 425482b)
Merge branch 'master' into martin-t/uncrustify
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 8 Oct 2017 13:03:16 +0000 (15:03 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 8 Oct 2017 13:03:16 +0000 (15:03 +0200)

Trivial merge