Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- src/libs/utils/pathchooser.cpp 1 addition, 1 deletionsrc/libs/utils/pathchooser.cpp
- src/plugins/qt4projectmanager/qt4nodes.cpp 1 addition, 1 deletionsrc/plugins/qt4projectmanager/qt4nodes.cpp
- src/plugins/qt4projectmanager/qt4project.cpp 25 additions, 0 deletionssrc/plugins/qt4projectmanager/qt4project.cpp
- src/plugins/qt4projectmanager/qt4project.h 6 additions, 0 deletionssrc/plugins/qt4projectmanager/qt4project.h
- src/plugins/resourceeditor/resourceeditorconstants.h 0 additions, 1 deletionsrc/plugins/resourceeditor/resourceeditorconstants.h
- src/plugins/resourceeditor/resourceeditorw.cpp 1 addition, 1 deletionsrc/plugins/resourceeditor/resourceeditorw.cpp
- src/shared/qrceditor/qrceditor.cpp 1 addition, 3 deletionssrc/shared/qrceditor/qrceditor.cpp
- src/tools/qtcreatorwidgets/qtcreatorwidgets.pro 8 additions, 2 deletionssrc/tools/qtcreatorwidgets/qtcreatorwidgets.pro
Loading
Please register or sign in to comment