Merge branch 'master' into martin-t/okc
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 15:04:58 +0000 (17:04 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 27 Aug 2017 15:04:58 +0000 (17:04 +0200)
commit0c6b993abfdde30411dc771643b8d25b8377cb50
tree0fbc6a5d994dc58f6dfedca546b9ec07d4f09b69
parentc4d74d87a80b9cbbac1d6bfcaa6f15bac5ee0db5
parentc8590ef997cead612e4b09ee96bdd66d472ff906
Merge branch 'master' into martin-t/okc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/t_items.qc
qcsrc/common/t_items.qh