]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/PlayerTemplates
authorLyberta <lyberta@lyberta.net>
Sat, 25 Nov 2017 06:48:33 +0000 (09:48 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 25 Nov 2017 06:48:33 +0000 (09:48 +0300)
commit0bf857b225e3f3cded8e7d1aa9bd662a889de9c3
treef3f5208a7261d8bec087d93c9b9e9454fffb1d70
parent0be0bdbf30e0c97f871ee560bee30129bef98935
parent700861789922294ffa4b654a6683be45993240d1
Merge branch 'master' into Lyberta/PlayerTemplates