diff options
| author | Kavindra Devi Palaraja <kavindra.palaraja@nokia.com> | 2009-04-02 10:40:37 +0200 |
|---|---|---|
| committer | Kavindra Devi Palaraja <kavindra.palaraja@nokia.com> | 2009-04-02 10:40:37 +0200 |
| commit | 939345c6b24b45dac963f327f5339605618c7d32 (patch) | |
| tree | 78ab0df50ef4a854c31a602f1b5e35fcdad1e172 /src/plugins/cpptools/cppcodecompletion.cpp | |
| parent | a68f6049657c4731b8d632fc3f5f2668fc00e847 (diff) | |
| download | qt-creator-939345c6b24b45dac963f327f5339605618c7d32.tar.gz | |
Doc - fixing a merge conflict.
Diffstat (limited to 'src/plugins/cpptools/cppcodecompletion.cpp')
0 files changed, 0 insertions, 0 deletions