Merge remote-tracking branch 'origin/release' into stable
authorJani Heikkinen <jani.heikkinen@digia.com>
Wed, 23 Apr 2014 09:44:13 +0000 (12:44 +0300)
committerJani Heikkinen <jani.heikkinen@digia.com>
Wed, 23 Apr 2014 09:44:14 +0000 (12:44 +0300)
Change-Id: I1214586499ab2876c8bc55a99367a0c938c8b919

1  2 
src/qml/compiler/qv4codegen.cpp
src/qml/jit/qv4assembler_p.h
src/qml/jit/qv4isel_masm.cpp

Simple merge
Simple merge
Simple merge