Merge branch '1.3' of git@scm.dev.nokia.troll.no:creator/mainline into 1.3
Conflicts: src/plugins/cpptools/cppfindreferences.cpp src/plugins/cpptools/cpptoolsplugin.cpp src/plugins/texteditor/basefilefind.cpp
Showing
- src/libs/cplusplus/ResolveExpression.cpp 131 additions, 147 deletionssrc/libs/cplusplus/ResolveExpression.cpp
- src/libs/cplusplus/ResolveExpression.h 8 additions, 14 deletionssrc/libs/cplusplus/ResolveExpression.h
- src/libs/utils/abstractprocess.h 0 additions, 2 deletionssrc/libs/utils/abstractprocess.h
- src/libs/utils/abstractprocess_win.cpp 0 additions, 2 deletionssrc/libs/utils/abstractprocess_win.cpp
- src/libs/utils/basevalidatinglineedit.cpp 0 additions, 2 deletionssrc/libs/utils/basevalidatinglineedit.cpp
- src/libs/utils/basevalidatinglineedit.h 0 additions, 2 deletionssrc/libs/utils/basevalidatinglineedit.h
- src/libs/utils/checkablemessagebox.cpp 0 additions, 2 deletionssrc/libs/utils/checkablemessagebox.cpp
- src/libs/utils/checkablemessagebox.h 0 additions, 2 deletionssrc/libs/utils/checkablemessagebox.h
- src/libs/utils/checkablemessagebox.ui 4 additions, 4 deletionssrc/libs/utils/checkablemessagebox.ui
- src/libs/utils/classnamevalidatinglineedit.cpp 2 additions, 4 deletionssrc/libs/utils/classnamevalidatinglineedit.cpp
- src/libs/utils/classnamevalidatinglineedit.h 1 addition, 3 deletionssrc/libs/utils/classnamevalidatinglineedit.h
- src/libs/utils/codegeneration.cpp 0 additions, 2 deletionssrc/libs/utils/codegeneration.cpp
- src/libs/utils/codegeneration.h 0 additions, 2 deletionssrc/libs/utils/codegeneration.h
- src/libs/utils/consoleprocess.cpp 0 additions, 2 deletionssrc/libs/utils/consoleprocess.cpp
- src/libs/utils/consoleprocess.h 0 additions, 2 deletionssrc/libs/utils/consoleprocess.h
- src/libs/utils/consoleprocess_unix.cpp 1 addition, 1 deletionsrc/libs/utils/consoleprocess_unix.cpp
- src/libs/utils/consoleprocess_win.cpp 1 addition, 1 deletionsrc/libs/utils/consoleprocess_win.cpp
- src/libs/utils/fancylineedit.cpp 0 additions, 2 deletionssrc/libs/utils/fancylineedit.cpp
- src/libs/utils/fancylineedit.h 0 additions, 2 deletionssrc/libs/utils/fancylineedit.h
- src/libs/utils/fancymainwindow.cpp 1 addition, 1 deletionsrc/libs/utils/fancymainwindow.cpp
Loading
Please register or sign in to comment