diff options
| author | Leena Miettinen <riitta-leena.miettinen@nokia.com> | 2011-11-24 10:10:19 +0100 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@nokia.com> | 2011-11-24 10:23:48 +0100 |
| commit | b7692adbd6ac1bd55d76957a7073b80321dac2ad (patch) | |
| tree | 4baaa3a62f7d9587bb8ea5627e61b1584bbb696d /src/plugins/cpptools/cppfilesettingspage.cpp | |
| parent | faeb6b31be070f667016b3370c88b1ae110da334 (diff) | |
| download | qt-creator-b7692adbd6ac1bd55d76957a7073b80321dac2ad.tar.gz | |
Doc: resolve merge conflicts
Change-Id: I76f544e86acd903864e301c798048f95d62b79a3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Diffstat (limited to 'src/plugins/cpptools/cppfilesettingspage.cpp')
0 files changed, 0 insertions, 0 deletions