Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorSimon Hausmann <simon.hausmann@digia.com>
Fri, 24 Jan 2014 17:27:50 +0000 (18:27 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 24 Jan 2014 17:27:50 +0000 (18:27 +0100)
commit9a5568a1972b72b32ae3058903cc7f4d7123b96b
tree609f9c01f223a83d608f6a0aa391ea1a79c67ca2
parentc6d90f47b98bfa99b4ed60241582919746098ddb
parent22041acdfe85c9a9b814e11cd86e8ee5a55be82d
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4regexpobject.cpp