]> 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: 9e570e8 af7ecbf)
Merge branch 'master' into Lyberta/DebugPrintToChat
authorLyberta <lyberta@lyberta.net>
Sun, 2 Apr 2017 16:01:59 +0000 (19:01 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 2 Apr 2017 16:01:59 +0000 (19:01 +0300)

Trivial merge