Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta (a4ed1bc9) · Commits · Tobias Hunger / qt-creator · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

qt-creator
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

a4ed1bc9

Commit a4ed1bc9 authored 16 years ago by hjk

Downloads
- Plain Diff

Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta

parents 18b3d258 b3f0f33b

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/libs/cplusplus/CppDocument.cpp 2 additions, 2 deletions

src/libs/cplusplus/CppDocument.cpp
src/libs/cplusplus/CppDocument.h 21 additions, 4 deletions

src/libs/cplusplus/CppDocument.h
src/libs/cplusplus/pp-engine.cpp 5 additions, 4 deletions

src/libs/cplusplus/pp-engine.cpp
src/libs/cplusplus/pp-macro.h 28 additions, 0 deletions

src/libs/cplusplus/pp-macro.h
src/plugins/cpptools/cpphoverhandler.cpp 15 additions, 10 deletions

src/plugins/cpptools/cpphoverhandler.cpp
src/plugins/cpptools/cppmodelmanager.cpp 2 additions, 2 deletions

src/plugins/cpptools/cppmodelmanager.cpp

with 73 additions and 22 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment