diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-09-15 11:50:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-09-15 11:50:29 +0200 |
| commit | b0efd44d20e9129c40b47ad3715c248962a947b9 (patch) | |
| tree | 4415eccb62e5fca5bf1f83d19f1cdaad6ca339e7 /doc/images/qtcreator-meego-emulator-connection.png | |
| parent | 8801c76a8e223b6f41a8369e75c71b67237d8d25 (diff) | |
| parent | 33cd873d56f948b4805da31adaf436618ac7edac (diff) | |
| download | qt-creator-b0efd44d20e9129c40b47ad3715c248962a947b9.tar.gz | |
Merge remote-tracking branch 'origin/2.3'
Conflicts:
qtcreator.pri
qtcreator.pro
share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
src/plugins/remotelinux/remotelinuxruncontrol.cpp
Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
Diffstat (limited to 'doc/images/qtcreator-meego-emulator-connection.png')
| -rw-r--r-- | doc/images/qtcreator-meego-emulator-connection.png | bin | 0 -> 12610 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/images/qtcreator-meego-emulator-connection.png b/doc/images/qtcreator-meego-emulator-connection.png Binary files differnew file mode 100644 index 0000000000..29c0135ee4 --- /dev/null +++ b/doc/images/qtcreator-meego-emulator-connection.png |