Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
Conflicts: src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
Showing
- doc/doxygen/Doxyfile 1 addition, 1 deletiondoc/doxygen/Doxyfile
- doc/eike_doc.patch 0 additions, 138 deletionsdoc/eike_doc.patch
- share/qtcreator/gdbmacros/test/main.cpp 15 additions, 1 deletionshare/qtcreator/gdbmacros/test/main.cpp
- src/libs/cplusplus/CheckUndefinedSymbols.cpp 21 additions, 21 deletionssrc/libs/cplusplus/CheckUndefinedSymbols.cpp
- src/libs/cplusplus/CheckUndefinedSymbols.h 3 additions, 3 deletionssrc/libs/cplusplus/CheckUndefinedSymbols.h
- src/libs/cplusplus/CppBindings.cpp 35 additions, 35 deletionssrc/libs/cplusplus/CppBindings.cpp
- src/libs/cplusplus/CppBindings.h 17 additions, 17 deletionssrc/libs/cplusplus/CppBindings.h
- src/libs/cplusplus/CppDocument.cpp 3 additions, 3 deletionssrc/libs/cplusplus/CppDocument.cpp
- src/libs/cplusplus/FindUsages.cpp 4 additions, 4 deletionssrc/libs/cplusplus/FindUsages.cpp
- src/libs/cplusplus/FindUsages.h 2 additions, 2 deletionssrc/libs/cplusplus/FindUsages.h
- src/libs/cplusplus/GenTemplateInstance.cpp 21 additions, 19 deletionssrc/libs/cplusplus/GenTemplateInstance.cpp
- src/libs/cplusplus/GenTemplateInstance.h 1 addition, 1 deletionsrc/libs/cplusplus/GenTemplateInstance.h
- src/libs/cplusplus/LookupContext.cpp 25 additions, 25 deletionssrc/libs/cplusplus/LookupContext.cpp
- src/libs/cplusplus/LookupContext.h 16 additions, 16 deletionssrc/libs/cplusplus/LookupContext.h
- src/libs/cplusplus/NamePrettyPrinter.cpp 13 additions, 14 deletionssrc/libs/cplusplus/NamePrettyPrinter.cpp
- src/libs/cplusplus/NamePrettyPrinter.h 8 additions, 8 deletionssrc/libs/cplusplus/NamePrettyPrinter.h
- src/libs/cplusplus/Overview.cpp 2 additions, 2 deletionssrc/libs/cplusplus/Overview.cpp
- src/libs/cplusplus/Overview.h 4 additions, 4 deletionssrc/libs/cplusplus/Overview.h
- src/libs/cplusplus/ResolveExpression.cpp 24 additions, 24 deletionssrc/libs/cplusplus/ResolveExpression.cpp
- src/libs/cplusplus/ResolveExpression.h 7 additions, 7 deletionssrc/libs/cplusplus/ResolveExpression.h
Loading
Please register or sign in to comment