diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-07-15 14:29:07 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-07-15 14:29:07 +0200 |
| commit | e5ca4b346282d17e4c30e4ac41c46dc94fd53d76 (patch) | |
| tree | b2a4868eb1f45bc4b5a728ec15782d14e9b86457 /doc/images/qml-observer-view.png | |
| parent | ab8713d7921ba915efb4e2f1f40ad0b3ce1a12f2 (diff) | |
| parent | dbc0fa091926926ff6e26d3fcae74a596512798b (diff) | |
| download | qt-creator-e5ca4b346282d17e4c30e4ac41c46dc94fd53d76.tar.gz | |
Merge remote-tracking branch 'origin/2.3'
Conflicts:
qtcreator.pri
share/qtcreator/dumper/dumper.py
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
src/plugins/valgrind/valgrind.pro
tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
Diffstat (limited to 'doc/images/qml-observer-view.png')
| -rw-r--r-- | doc/images/qml-observer-view.png | bin | 15212 -> 21763 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/images/qml-observer-view.png b/doc/images/qml-observer-view.png Binary files differindex 3df1169cb6..eabbee8811 100644 --- a/doc/images/qml-observer-view.png +++ b/doc/images/qml-observer-view.png |
