diff options
| author | con <qtc-committer@nokia.com> | 2010-05-21 16:04:27 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-05-21 16:04:27 +0200 |
| commit | e327467a03350a21a08b274cecbee7840f22339d (patch) | |
| tree | 59f47b9dc20431d5d2ef5510a04be3b5727b4bf7 /src/shared/cplusplus/Control.cpp | |
| parent | ec6fc83c5d6865550caf49de67b877d632020e7a (diff) | |
| parent | e9d184155232805d4c82eb164768282fc61fca38 (diff) | |
| download | qt-creator-e327467a03350a21a08b274cecbee7840f22339d.tar.gz | |
Merge remote branch 'origin/2.0'
Conflicts:
doc/qtcreator.qdoc
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
Diffstat (limited to 'src/shared/cplusplus/Control.cpp')
0 files changed, 0 insertions, 0 deletions