Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
Conflicts: src/plugins/qt4projectmanager/qtversionmanager.cpp
Showing
- bin/gdbmacros/gdbmacros.cpp 15 additions, 4 deletionsbin/gdbmacros/gdbmacros.cpp
- doc/qtcreator.qdoc 41 additions, 37 deletionsdoc/qtcreator.qdoc
- shared/help/bookmarkmanager.h 9 additions, 7 deletionsshared/help/bookmarkmanager.h
- src/app/main.cpp 2 additions, 2 deletionssrc/app/main.cpp
- src/libs/cplusplus/cplusplus.pro 14 additions, 2 deletionssrc/libs/cplusplus/cplusplus.pro
- src/libs/cplusplus/pp-cctype.h 2 additions, 2 deletionssrc/libs/cplusplus/pp-cctype.h
- src/libs/cplusplus/pp-client.h 2 additions, 2 deletionssrc/libs/cplusplus/pp-client.h
- src/libs/cplusplus/pp-engine.cpp 0 additions, 1 deletionsrc/libs/cplusplus/pp-engine.cpp
- src/libs/cplusplus/pp-engine.h 3 additions, 3 deletionssrc/libs/cplusplus/pp-engine.h
- src/libs/cplusplus/pp-environment.cpp 1 addition, 1 deletionsrc/libs/cplusplus/pp-environment.cpp
- src/libs/cplusplus/pp-environment.h 2 additions, 2 deletionssrc/libs/cplusplus/pp-environment.h
- src/libs/cplusplus/pp-fwd.h 0 additions, 0 deletionssrc/libs/cplusplus/pp-fwd.h
- src/libs/cplusplus/pp-internal.h 2 additions, 2 deletionssrc/libs/cplusplus/pp-internal.h
- src/libs/cplusplus/pp-macro-expander.cpp 1 addition, 1 deletionsrc/libs/cplusplus/pp-macro-expander.cpp
- src/libs/cplusplus/pp-macro-expander.h 2 additions, 2 deletionssrc/libs/cplusplus/pp-macro-expander.h
- src/libs/cplusplus/pp-macro.h 2 additions, 2 deletionssrc/libs/cplusplus/pp-macro.h
- src/libs/cplusplus/pp-scanner.h 2 additions, 2 deletionssrc/libs/cplusplus/pp-scanner.h
- src/libs/cplusplus/pp.h 0 additions, 0 deletionssrc/libs/cplusplus/pp.h
- src/libs/utils/pathchooser.cpp 108 additions, 23 deletionssrc/libs/utils/pathchooser.cpp
- src/libs/utils/pathchooser.h 19 additions, 1 deletionsrc/libs/utils/pathchooser.h
Loading
Please register or sign in to comment