]> 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 | combined (merge: a897ab1 a860ac3)
Merge branch 'master' into Lyberta/TeamplayFixes_
authorLyberta <lyberta@lyberta.net>
Sat, 18 Mar 2017 13:48:23 +0000 (16:48 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 18 Mar 2017 13:48:23 +0000 (16:48 +0300)

Trivial merge