con
|
30fae3eab1
|
Merge remote branch 'origin/2.0'
Conflicts:
doc/qtcreator.qdoc
src/plugins/projectexplorer/taskwindow.h
src/plugins/qmldesigner/designercore/model/modelmerger.cpp
src/plugins/qmljseditor/qmljshoverhandler.h
src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
src/plugins/subversion/subversionplugin.cpp
|
2010-06-11 16:30:39 +02:00 |
|
kh1
|
1b6ad08795
|
Move help manager into core.
- lessens open file handles
- improves help plugin startup further
Task-number: QTCREATORBUG-337
Reviewed-by: ck
|
2010-06-11 13:11:37 +02:00 |
|
Roberto Raggi
|
726c3345c4
|
Moved qmljsmodelmanagerinterface.h
|
2010-06-10 11:59:27 +02:00 |
|
hjk
|
9595504bda
|
Long live the king!
|
2010-03-05 11:28:13 +01:00 |
|
Roberto Raggi
|
2a63387085
|
Renamed qmlmodelmanager.
|
2010-02-15 13:49:00 +01:00 |
|
Roberto Raggi
|
52b04f5d99
|
Renamed qmlhoverhandler.
|
2010-02-15 13:42:58 +01:00 |
|