diff options
| author | con <qtc-committer@nokia.com> | 2010-05-17 17:40:40 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-05-17 17:40:40 +0200 |
| commit | 38f6379f3949779963b90c904e02314c8f2eaa50 (patch) | |
| tree | 146111bd5b7a5a73bef2cfde7e561e3375d6360e /src/plugins/cpptools/cppcodecompletion.cpp | |
| parent | d8318a9502b2de2a5fc2e8984deb1383a4e216f7 (diff) | |
| parent | b52f3cb27464d20302599dec0f63e950a39dd64c (diff) | |
| download | qt-creator-38f6379f3949779963b90c904e02314c8f2eaa50.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
doc/qtcreator.qdoc
src/plugins/find/currentdocumentfind.cpp
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
Diffstat (limited to 'src/plugins/cpptools/cppcodecompletion.cpp')
0 files changed, 0 insertions, 0 deletions