]> 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: f779d25 a0ffa60)
Merge branch 'master' into Lyberta/TeamplayOverhaul
authorLyberta <lyberta@lyberta.net>
Sun, 11 Mar 2018 06:06:40 +0000 (09:06 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 11 Mar 2018 06:06:40 +0000 (09:06 +0300)

Trivial merge