]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Sun, 11 Feb 2018 02:35:05 +0000 (05:35 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 11 Feb 2018 02:35:05 +0000 (05:35 +0300)
commit9a75d97de750f0541463fcbc07c60db7a3a6c325
treedd3ec89a183924ef17d151770c3677f6f97f567a
parent4c6e246aebd8df84365c989555f8600a5c704161
parentdd23509188e500cf08c6c33b8e37d4faeae6f1d3
Merge branch 'master' into Lyberta/PlayerTemplates