diff options
| author | hjk <qtc-committer@nokia.com> | 2010-08-12 11:07:08 +0200 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2010-08-12 11:07:08 +0200 |
| commit | afcc0f7bf12b1eff8eda2640dfa3ac292c649136 (patch) | |
| tree | ddd2b28995461e31b0e5c8763a5ece52f6e05906 /src/libs/cplusplus/OverviewModel.cpp | |
| parent | 28590651935ac59d687037a9581d1c21b88721fd (diff) | |
| parent | e253896b58ded12cf68c4cd5937e383a0342488b (diff) | |
| download | qt-creator-afcc0f7bf12b1eff8eda2640dfa3ac292c649136.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.h
Diffstat (limited to 'src/libs/cplusplus/OverviewModel.cpp')
0 files changed, 0 insertions, 0 deletions