diff options
| author | Lasse Holmstedt <lasse.holmstedt@nokia.com> | 2010-02-16 16:30:41 +0100 |
|---|---|---|
| committer | Lasse Holmstedt <lasse.holmstedt@nokia.com> | 2010-02-16 16:30:41 +0100 |
| commit | 4e5089d90de674e5c9b337c063b2a2296221679f (patch) | |
| tree | 3430101a41b638a8c8ac425047ae3d483db7437c /src/shared/cplusplus/Parser.cpp | |
| parent | 5262ca20615542d43e0ae7bc0620720c674f0cee (diff) | |
| parent | 580280af260c0fe261f8056495db8daf15c10b20 (diff) | |
| download | qt-creator-4e5089d90de674e5c9b337c063b2a2296221679f.tar.gz | |
Merge branch 'debugintegration'
Conflicts:
src/plugins/qmlprojectmanager/qmlproject.cpp
src/plugins/qmlprojectmanager/qmlproject.h
Diffstat (limited to 'src/shared/cplusplus/Parser.cpp')
0 files changed, 0 insertions, 0 deletions