2 Commits

Author	SHA1	Message	Date
Eike Ziller	85cf2b661e	Merge remote-tracking branch 'origin/2.4' ... Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39	2011-11-11 09:46:25 +01:00
hjk	ea63113364	debugger: consolidate listing of local processes ... Change-Id: I409fd58b3e9bb10de50e18e3658790c73e3fd521 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>	2011-11-03 13:57:07 +01:00