]> 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 | compact (merge: bd010de cde1b23)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 30 Sep 2018 16:13:18 +0000 (18:13 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 30 Sep 2018 16:13:18 +0000 (18:13 +0200)

Trivial merge