Merge branch 'stable' of ssh://codereview.qt-project.org/qt/qtjsbackend into dev
authorSimon Hausmann <simon.hausmann@digia.com>
Mon, 25 Feb 2013 12:56:05 +0000 (13:56 +0100)
committerSimon Hausmann <simon.hausmann@digia.com>
Mon, 25 Feb 2013 13:00:36 +0000 (14:00 +0100)
commit7ee91ac5621e2fd37c81b531b9488c0b5812a67f
treed9fa2466582fc9f1217ffc234935340109136a02
parent89acfd44e659502812949c7c71b6874e048b4748
parentcbd9ec0defc2558d32ddfd44fe22c1af9c7a36e7
Merge branch 'stable' of ssh://codereview.qt-project.org/qt/qtjsbackend into dev

Conflicts:
src/3rdparty/v8/src/platform-linux.cc
src/3rdparty/v8/src/platform-qnx.cc

Change-Id: I1b41564f2d52481335a5d3b2a931c77f9b03c903
src/3rdparty/v8/src/platform-linux.cc
src/3rdparty/v8/src/platform-qnx.cc