Merge pull request #4813 from pgavlin/gh3058
authorPat Gavlin <pgavlin@gmail.com>
Fri, 13 May 2016 13:30:46 +0000 (06:30 -0700)
committerPat Gavlin <pgavlin@gmail.com>
Fri, 13 May 2016 13:30:46 +0000 (06:30 -0700)
commitbeef595f0357128233caae1b0a0eb89cdc540bbb
tree7f1a3ff54cc5257c30c999589f6623ef51a8c939
parent57d1b4c3e0c3e446609fb000646ab4586a558b11
parent849160e0510efefe664034554437599d72c3234b
Merge pull request #4813 from pgavlin/gh3058

Disable FEATURE_MERGE_JIT_AND_ENGINE on *nix.