Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline
Conflicts: doc/qtcreator.qdoc doc/qtcreator.qdocconf share/qtcreator/gdbmacros/dumper.py share/qtcreator/gdbmacros/gdbmacros.py src/plugins/debugger/debuggermanager.cpp src/plugins/debugger/gdb/attachgdbadapter.cpp src/plugins/debugger/gdb/gdbengine.cpp src/plugins/debugger/watchhandler.cpp src/plugins/mercurial/mercurialjobrunner.h src/plugins/qmljseditor/qmljseditor.cpp src/plugins/qmljseditor/qmljseditor.pro src/plugins/qmljseditor/qmljseditorplugin.cpp src/plugins/qmljseditor/qmljseditorplugin.h src/plugins/qmljseditor/qmljspreviewrunner.cpp src/plugins/qmljseditor/qmljspreviewrunner.h src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp src/plugins/qt4projectmanager/qt4projectmanager.pro src/plugins/qt4projectmanager/qtversionmanager.h src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp src/plugins/qt4projectmanager/wizards/targetsetuppage.h
No related branches found
No related tags found
Showing
- dist/changes-2.0.1 1 addition, 0 deletionsdist/changes-2.0.1
- doc/images/qtcreator-screenshot-build-settings.png 0 additions, 0 deletionsdoc/images/qtcreator-screenshot-build-settings.png
- doc/images/qtcreator-watcher.png 0 additions, 0 deletionsdoc/images/qtcreator-watcher.png
- doc/maemodev.qdoc 593 additions, 0 deletionsdoc/maemodev.qdoc
- doc/qt-defines.qdocconf 2 additions, 1 deletiondoc/qt-defines.qdocconf
- doc/qtcreator.qdoc 141 additions, 866 deletionsdoc/qtcreator.qdoc
- doc/qtcreator.qdocconf 8 additions, 1 deletiondoc/qtcreator.qdocconf
- doc/symbiandev.qdoc 154 additions, 0 deletionsdoc/symbiandev.qdoc
- share/qtcreator/gdbmacros/dumper.py 3 additions, 7 deletionsshare/qtcreator/gdbmacros/dumper.py
- share/qtcreator/gdbmacros/gdbmacros.py 18 additions, 1 deletionshare/qtcreator/gdbmacros/gdbmacros.py
- share/qtcreator/qml-type-descriptions/qml-builtin-types.xml 141 additions, 82 deletionsshare/qtcreator/qml-type-descriptions/qml-builtin-types.xml
- share/qtcreator/translations/qtcreator_de.ts 8 additions, 0 deletionsshare/qtcreator/translations/qtcreator_de.ts
- share/qtcreator/translations/qtcreator_ja.ts 2 additions, 2 deletionsshare/qtcreator/translations/qtcreator_ja.ts
- share/qtcreator/translations/qtcreator_pl.ts 634 additions, 4421 deletionsshare/qtcreator/translations/qtcreator_pl.ts
- share/qtcreator/translations/qtcreator_sl.ts 8 additions, 0 deletionsshare/qtcreator/translations/qtcreator_sl.ts
- src/plugins/bineditor/bineditorplugin.cpp 5 additions, 3 deletionssrc/plugins/bineditor/bineditorplugin.cpp
- src/plugins/cpaster/cpasterplugin.cpp 2 additions, 0 deletionssrc/plugins/cpaster/cpasterplugin.cpp
- src/plugins/debugger/debuggermanager.cpp 2041 additions, 0 deletionssrc/plugins/debugger/debuggermanager.cpp
- src/plugins/debugger/gdb/attachgdbadapter.cpp 1 addition, 1 deletionsrc/plugins/debugger/gdb/attachgdbadapter.cpp
- src/plugins/debugger/watchhandler.cpp 6 additions, 3 deletionssrc/plugins/debugger/watchhandler.cpp
Loading
Please register or sign in to comment