Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Conflicts: src/plugins/perforce/perforceplugin.cpp
Showing
- doc/doc.pri 5 additions, 1 deletiondoc/doc.pri
- doc/qtcreator-session-manager.png 0 additions, 0 deletionsdoc/qtcreator-session-manager.png
- doc/qtcreator-session-menu.png 0 additions, 0 deletionsdoc/qtcreator-session-menu.png
- doc/qtcreator-vcs-annotate.png 0 additions, 0 deletionsdoc/qtcreator-vcs-annotate.png
- doc/qtcreator-vcs-commit.png 0 additions, 0 deletionsdoc/qtcreator-vcs-commit.png
- doc/qtcreator-vcs-describe.png 0 additions, 0 deletionsdoc/qtcreator-vcs-describe.png
- doc/qtcreator-vcs-diff.png 0 additions, 0 deletionsdoc/qtcreator-vcs-diff.png
- doc/qtcreator-vcs-gitbranch.png 0 additions, 0 deletionsdoc/qtcreator-vcs-gitbranch.png
- doc/qtcreator-vcs-log.png 0 additions, 0 deletionsdoc/qtcreator-vcs-log.png
- doc/qtcreator-vcs-pane.png 0 additions, 0 deletionsdoc/qtcreator-vcs-pane.png
- doc/qtcreator.qdoc 243 additions, 16 deletionsdoc/qtcreator.qdoc
- scripts/shipping/prepare-linux-qt-for-shipping.sh 42 additions, 8 deletionsscripts/shipping/prepare-linux-qt-for-shipping.sh
- shared/cplusplus/Parser.cpp 3 additions, 0 deletionsshared/cplusplus/Parser.cpp
- shared/scriptwrapper/interface_wrap_helpers.h 0 additions, 1 deletionshared/scriptwrapper/interface_wrap_helpers.h
- src/libs/cplusplus/pp-engine.cpp 15 additions, 1 deletionsrc/libs/cplusplus/pp-engine.cpp
- src/libs/extensionsystem/ExtensionSystemInterfaces 0 additions, 39 deletionssrc/libs/extensionsystem/ExtensionSystemInterfaces
- src/plugins/bineditor/bineditorplugin.cpp 27 additions, 24 deletionssrc/plugins/bineditor/bineditorplugin.cpp
- src/plugins/bineditor/bineditorplugin.h 0 additions, 1 deletionsrc/plugins/bineditor/bineditorplugin.h
- src/plugins/bookmarks/bookmarkmanager.cpp 17 additions, 17 deletionssrc/plugins/bookmarks/bookmarkmanager.cpp
- src/plugins/bookmarks/bookmarkmanager.h 0 additions, 2 deletionssrc/plugins/bookmarks/bookmarkmanager.h
Loading
Please register or sign in to comment