]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:56:01 +0000 (18:56 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:56:01 +0000 (18:56 +0300)
commita51cbdfb38a5a52863e2fa4f1905022eba778e52
treeaf6e485b9253ae55761b4879baab1020413670ea
parent0bf857b225e3f3cded8e7d1aa9bd662a889de9c3
parent65493c17d47c0d5ece5e28a999a0162c5b070acb
Merge branch 'master' into Lyberta/PlayerTemplates