diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-12-09 12:42:01 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-12-09 12:42:01 +0100 |
| commit | c175f1e62f8eb37e43a30e87ae9e693ef56dabac (patch) | |
| tree | c35ee7e45ffbe3d56f76e0b2be91ee53676d0881 /doc/images | |
| parent | 77b8198c2b1eadcd3f3a6bb9d97275d0f2d05a14 (diff) | |
| parent | 5071dd80cb352ebfe67209e3f3bc70ef619a5ccf (diff) | |
| download | qt-creator-c175f1e62f8eb37e43a30e87ae9e693ef56dabac.tar.gz | |
Merge remote-tracking branch 'origin/4.2'
Conflicts:
src/plugins/ios/iosdevice.cpp
src/plugins/ios/iossimulator.cpp
src/plugins/projectexplorer/projectwindow.cpp
src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp
src/shared/qbs
Change-Id: Ie98e2401a2259903141a13170c78388f2da467d2
Diffstat (limited to 'doc/images')
| -rw-r--r-- | doc/images/qtcreator-ios-add-kit.png | bin | 46365 -> 23695 bytes |
| -rw-r--r-- | doc/images/qtcreator-project-kits.png | bin | 27758 -> 30590 bytes |
| -rwxr-xr-x | doc/images/qtcreator-valgrind-callgrind.png | bin | 5250 -> 5148 bytes |
| -rw-r--r-- | doc/images/qtcreator-valgrind-memcheck.png | bin | 2487 -> 2345 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/doc/images/qtcreator-ios-add-kit.png b/doc/images/qtcreator-ios-add-kit.png Binary files differindex fcde8b8c14..fa3bee62b5 100644 --- a/doc/images/qtcreator-ios-add-kit.png +++ b/doc/images/qtcreator-ios-add-kit.png diff --git a/doc/images/qtcreator-project-kits.png b/doc/images/qtcreator-project-kits.png Binary files differindex d8f5a69c4e..0a3eb9964b 100644 --- a/doc/images/qtcreator-project-kits.png +++ b/doc/images/qtcreator-project-kits.png diff --git a/doc/images/qtcreator-valgrind-callgrind.png b/doc/images/qtcreator-valgrind-callgrind.png Binary files differindex 1478191783..34396a5663 100755 --- a/doc/images/qtcreator-valgrind-callgrind.png +++ b/doc/images/qtcreator-valgrind-callgrind.png diff --git a/doc/images/qtcreator-valgrind-memcheck.png b/doc/images/qtcreator-valgrind-memcheck.png Binary files differindex 3054d4ffbe..8bcbcbc404 100644 --- a/doc/images/qtcreator-valgrind-memcheck.png +++ b/doc/images/qtcreator-valgrind-memcheck.png |
