Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
Conflicts: src/plugins/cmakeprojectmanager/cmakeproject.cpp
Showing
- doc/qtcreator.qch 0 additions, 0 deletionsdoc/qtcreator.qch
- doc/qtcreator.qdoc 15 additions, 15 deletionsdoc/qtcreator.qdoc
- shared/cpaster/cgi.cpp 7 additions, 7 deletionsshared/cpaster/cgi.cpp
- shared/cpaster/splitter.cpp 1 addition, 3 deletionsshared/cpaster/splitter.cpp
- shared/cpaster/view.cpp 2 additions, 2 deletionsshared/cpaster/view.cpp
- shared/cplusplus/Control.cpp 6 additions, 0 deletionsshared/cplusplus/Control.cpp
- shared/cplusplus/Control.h 5 additions, 0 deletionsshared/cplusplus/Control.h
- shared/help/helpviewer.cpp 1 addition, 1 deletionshared/help/helpviewer.cpp
- shared/indenter/test/main.cpp 1 addition, 1 deletionshared/indenter/test/main.cpp
- shared/proparser/proeditor.cpp 3 additions, 6 deletionsshared/proparser/proeditor.cpp
- shared/proparser/proeditormodel.cpp 10 additions, 11 deletionsshared/proparser/proeditormodel.cpp
- shared/proparser/profileevaluator.cpp 6 additions, 6 deletionsshared/proparser/profileevaluator.cpp
- shared/proparser/proparserutils.h 20 additions, 20 deletionsshared/proparser/proparserutils.h
- shared/proparser/prowriter.cpp 3 additions, 3 deletionsshared/proparser/prowriter.cpp
- shared/proparser/proxml.cpp 1 addition, 1 deletionshared/proparser/proxml.cpp
- shared/proparser/valueeditor.cpp 1 addition, 1 deletionshared/proparser/valueeditor.cpp
- shared/qrceditor/resourcefile.cpp 10 additions, 10 deletionsshared/qrceditor/resourcefile.cpp
- shared/qrceditor/resourceview.cpp 9 additions, 10 deletionsshared/qrceditor/resourceview.cpp
- shared/qtsingleapplication/qtlocalpeer.cpp 3 additions, 7 deletionsshared/qtsingleapplication/qtlocalpeer.cpp
- src/libs/cplusplus/OverviewModel.cpp 36 additions, 10 deletionssrc/libs/cplusplus/OverviewModel.cpp
Loading
Please register or sign in to comment