]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into martin-t/okc
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 25 Aug 2017 15:08:43 +0000 (17:08 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 25 Aug 2017 15:08:43 +0000 (17:08 +0200)
commitf67b2effcc9360ae443fc7da413d37b84e060e19
tree9cfbfab589bf7f06b0a980379d4d49043f38b709
parent3e8e73d5c867c2833409e33782d91c45fa0769eb
parente57fd111a3279a4aa4789e2c72f9c819a56c7be9
Merge branch 'master' into martin-t/okc
qcsrc/common/mutators/mutator/nades/nades.qc