diff options
| author | dt <qtc-committer@nokia.com> | 2010-11-10 17:00:07 +0100 |
|---|---|---|
| committer | dt <qtc-committer@nokia.com> | 2010-11-10 17:02:40 +0100 |
| commit | 4ac7253205d8aea12fce85f110b536f7e1fa0230 (patch) | |
| tree | cc59733aad7b99cd7f20fd988c5a25fc7c5df2cd /src/plugins/cpptools/cppfilesettingspage.cpp | |
| parent | f987eccd28a493d6db30761c86e37b49a17d5b8c (diff) | |
| parent | fb46c31934c44ee1f83075b5f3647df4eec588c7 (diff) | |
| download | qt-creator-4ac7253205d8aea12fce85f110b536f7e1fa0230.tar.gz | |
Merge remote branch 'origin/2.1'
Conflicts:
share/qtcreator/static.pro
src/plugins/cppeditor/cppeditor.cpp
src/plugins/qmljseditor/qmljseditor.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
src/plugins/qt4projectmanager/qtoutputformatter.cpp
src/plugins/texteditor/generichighlighter/highlightersettings.cpp
Diffstat (limited to 'src/plugins/cpptools/cppfilesettingspage.cpp')
0 files changed, 0 insertions, 0 deletions