]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge branch 'master' into debugger/go
authorMirio <opivy@hotmail.de>
Sat, 11 Jul 2015 15:32:33 +0000 (17:32 +0200)
committerMirio <opivy@hotmail.de>
Sat, 11 Jul 2015 15:32:33 +0000 (17:32 +0200)
commitc5da69e81d692a393c4e394d9851e3f72481e47c
treed3a69199ceb858237ea9669c075aa7c4e9708db6
parentf598be68b72070320306a87c7315edb0d98e30ef
parent9793a2f00636a2fede049704b252a5a5bb42c8ea
Merge branch 'master' into debugger/go
scripts/shaderlist.txt