]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sun, 25 Jun 2017 20:40:45 +0000 (23:40 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 25 Jun 2017 20:40:45 +0000 (23:40 +0300)
commit7f5cc258e12ece06b7a518d652ddcb4a00d7040e
treeadee44e736cc06df680b82bd3d7e598e8c8ff26a
parent6b80dd9caa16a0825b8bf0d0f7b956e58a1e3295
parenta1c31ac3e636f8788e64da3d304bdb3c22b3e298
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival