hjk 5805788290 Merge remote branch 'origin/2.0' ...

Conflicts:
	src/plugins/projectexplorer/miniprojecttargetselector.cpp
	src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
	src/plugins/qmldesigner/designercore/model/rewriteactioncompressor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
	tests/manual/gdbdebugger/simple/app.cpp

2010-05-27 11:11:53 +02:00

..

gui

debugger: namespace new manual test

2010-03-05 16:44:49 +01:00

helper

debugger: start work on new stand-alone test for debugging helpers

2009-04-08 17:05:58 +02:00

python

debugger: some python polishing

2010-04-28 11:19:15 +02:00

script

Long live the king!

2010-03-05 11:28:13 +01:00

simple

Merge remote branch 'origin/2.0'

2010-05-27 11:11:53 +02:00

spacy path

Long live the king!

2010-03-05 11:28:13 +01:00

spacy-file

Long live the king!

2010-03-05 11:28:13 +01:00