Merge branch 'master' of git://scm.dev.nokia.troll.no/creator/mainline
Showing
- bin/gdbmacros/gdbmacros.cpp 110 additions, 130 deletionsbin/gdbmacros/gdbmacros.cpp
- doc/coding-style.qdoc 48 additions, 4 deletionsdoc/coding-style.qdoc
- 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.qdoc 7 additions, 8 deletionsdoc/qtcreator.qdoc
- src/libs/cplusplus/pp-engine.cpp 15 additions, 1 deletionsrc/libs/cplusplus/pp-engine.cpp
- src/plugins/bineditor/bineditorplugin.cpp 30 additions, 38 deletionssrc/plugins/bineditor/bineditorplugin.cpp
- src/plugins/bineditor/bineditorplugin.h 1 addition, 7 deletionssrc/plugins/bineditor/bineditorplugin.h
- src/plugins/bookmarks/bookmarkmanager.cpp 14 additions, 16 deletionssrc/plugins/bookmarks/bookmarkmanager.cpp
- src/plugins/bookmarks/bookmarkmanager.h 0 additions, 2 deletionssrc/plugins/bookmarks/bookmarkmanager.h
- src/plugins/bookmarks/bookmarksplugin.cpp 10 additions, 9 deletionssrc/plugins/bookmarks/bookmarksplugin.cpp
- src/plugins/bookmarks/bookmarksplugin.h 0 additions, 3 deletionssrc/plugins/bookmarks/bookmarksplugin.h
- src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp 3 additions, 5 deletionssrc/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
- src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp 2 additions, 2 deletionssrc/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp
- src/plugins/coreplugin/actionmanager/actioncontainer.cpp 4 additions, 7 deletionssrc/plugins/coreplugin/actionmanager/actioncontainer.cpp
- src/plugins/coreplugin/actionmanager/actionmanager.cpp 3 additions, 4 deletionssrc/plugins/coreplugin/actionmanager/actionmanager.cpp
- src/plugins/coreplugin/actionmanager/actionmanager_p.h 1 addition, 1 deletionsrc/plugins/coreplugin/actionmanager/actionmanager_p.h
- src/plugins/coreplugin/actionmanager/commandsfile.cpp 2 additions, 4 deletionssrc/plugins/coreplugin/actionmanager/commandsfile.cpp
- src/plugins/coreplugin/basefilewizard.cpp 12 additions, 26 deletionssrc/plugins/coreplugin/basefilewizard.cpp
- src/plugins/coreplugin/basefilewizard.h 8 additions, 11 deletionssrc/plugins/coreplugin/basefilewizard.h
Loading
Please register or sign in to comment