Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Showing
- src/libs/utils/consoleprocess_unix.cpp 6 additions, 1 deletionsrc/libs/utils/consoleprocess_unix.cpp
- src/libs/utils/process_stub.pro 8 additions, 1 deletionsrc/libs/utils/process_stub.pro
- src/libs/utils/process_stub_win.c 1 addition, 1 deletionsrc/libs/utils/process_stub_win.c
- src/plugins/designer/formeditorplugin.cpp 0 additions, 3 deletionssrc/plugins/designer/formeditorplugin.cpp
- src/plugins/designer/formeditorw.cpp 17 additions, 1 deletionsrc/plugins/designer/formeditorw.cpp
- src/plugins/designer/formeditorw.h 1 addition, 0 deletionssrc/plugins/designer/formeditorw.h
- src/plugins/projectexplorer/projectexplorer.cpp 1 addition, 1 deletionsrc/plugins/projectexplorer/projectexplorer.cpp
- src/plugins/projectexplorer/projectwindow.cpp 75 additions, 42 deletionssrc/plugins/projectexplorer/projectwindow.cpp
- src/plugins/projectexplorer/projectwindow.h 6 additions, 0 deletionssrc/plugins/projectexplorer/projectwindow.h
- src/plugins/projectexplorer/session.cpp 4 additions, 2 deletionssrc/plugins/projectexplorer/session.cpp
- src/plugins/projectexplorer/session.h 1 addition, 1 deletionsrc/plugins/projectexplorer/session.h
- src/plugins/qt4projectmanager/qt4runconfiguration.cpp 1 addition, 1 deletionsrc/plugins/qt4projectmanager/qt4runconfiguration.cpp
- src/shared/proparser/profileevaluator.cpp 98 additions, 112 deletionssrc/shared/proparser/profileevaluator.cpp
- src/shared/proparser/proparserutils.h 23 additions, 36 deletionssrc/shared/proparser/proparserutils.h
Loading
Please register or sign in to comment