Merge remote-tracking branch 'upstream/master'
authorLubomir Litchev <llitchev@live.com>
Mon, 2 Mar 2015 23:46:51 +0000 (15:46 -0800)
committerLubomir Litchev <llitchev@live.com>
Mon, 2 Mar 2015 23:46:51 +0000 (15:46 -0800)
commit55d7daf5dd094c2a48acea6b76077929d18d1f63
tree46a7452df454ae3d7de7598897879a94de228df9
parentcf20a16730bdf0487eb1e5f31495e20bf2e8b0f6
parent13066506128678ff58bd2dcc5f23007e8ccf6f14
Merge remote-tracking branch 'upstream/master'
Mergeddup changes.
Conflicts:
src/jit/codegencommon.cpp
src/jit/compiler.h
src/jit/emitxarch.cpp
src/jit/lclvars.cpp
src/jit/lsra.cpp