]> 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: 5b47b78 2fe686c)
Merge branch 'master' into Lyberta/GamemodesSplit
authorLyberta <lyberta@lyberta.net>
Sun, 29 Jul 2018 17:28:13 +0000 (20:28 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 29 Jul 2018 17:28:13 +0000 (20:28 +0300)

Trivial merge