]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:50:58 +0000 (19:50 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:50:58 +0000 (19:50 +0300)
commit6e3f46e7666b5d62c78472f466585f43452b6442
treee175d56833e29a183505b6fd079efc8d40578823
parentc7b33fc2dea9b90cef5bf08ff9a70f1b29c89b1e
parent71636e8f68cd31db1aabb442259a11c3bb3b3866
Merge branch 'master' into Lyberta/PlayerTemplates