2 Commits

Author	SHA1	Message	Date
Eike Ziller	e5ca4b3462	Merge remote-tracking branch 'origin/2.3' ... Conflicts: qtcreator.pri share/qtcreator/dumper/dumper.py share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp src/plugins/valgrind/valgrind.pro tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300	2011-07-15 14:29:07 +02:00
hjk	98c116491f	valgrind: code cosmetics ... Change-Id: I695c7d40aeb0b0b1e6f8cc0856e5fa5d9d1ce2d1 Reviewed-on: http://codereview.qt.nokia.com/1600 Reviewed-by: hjk <qthjk@ovi.com>	2011-07-13 15:39:04 +02:00