diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-25 10:16:46 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-25 10:16:46 +0100 |
| commit | 0df84b45e5a1e703b86cfcd5374b187aaf866e79 (patch) | |
| tree | 3b874ca818218f0ee69977276ee1f6d210342379 /doc | |
| parent | e54c5149841964d9527b04517441e0d9e64770d8 (diff) | |
| parent | ba859279c3a6d095d5b08253f7f6070a93ec90c0 (diff) | |
Merge remote-tracking branch 'origin/4.5' into 4.6
Conflicts:
src/shared/qbs
Change-Id: Ib734825a302efe41021307d7d64eb7b453262dc4
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/images/qtcreator-modeleditor-classes.png | bin | 24015 -> 86732 bytes |
| -rw-r--r-- | doc/images/qtcreator-modeleditor-packages.png | bin | 18444 -> 63689 bytes |
| -rw-r--r-- | doc/images/qtcreator-modeleditor.png | bin | 24681 -> 38168 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/doc/images/qtcreator-modeleditor-classes.png b/doc/images/qtcreator-modeleditor-classes.png Binary files differindex 182a1596e8..32aff713ef 100644 --- a/doc/images/qtcreator-modeleditor-classes.png +++ b/doc/images/qtcreator-modeleditor-classes.png diff --git a/doc/images/qtcreator-modeleditor-packages.png b/doc/images/qtcreator-modeleditor-packages.png Binary files differindex 50ba8f86d6..07b31e8552 100644 --- a/doc/images/qtcreator-modeleditor-packages.png +++ b/doc/images/qtcreator-modeleditor-packages.png diff --git a/doc/images/qtcreator-modeleditor.png b/doc/images/qtcreator-modeleditor.png Binary files differindex 52a404f59d..447c210c2e 100644 --- a/doc/images/qtcreator-modeleditor.png +++ b/doc/images/qtcreator-modeleditor.png |
