]> 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: b439d87 a45c020)
Merge branch 'Lyberta/TeamplayFixes' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sat, 11 Mar 2017 13:56:54 +0000 (16:56 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 11 Mar 2017 13:56:54 +0000 (16:56 +0300)

Trivial merge