diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-07 17:06:03 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-07 17:07:44 +0100 |
| commit | b907a01b467b551756b108f6c9a04d7e7382ae64 (patch) | |
| tree | 2d21d785186ce485f615034e6667d9673b62a4fc /examples/quick/scenegraph | |
| parent | 4f8537ff8c9427705e3587861a62fe81cf3e503b (diff) | |
| parent | 1d29d8edf8e4e709ca2f27791cdf8672c15488f3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
examples/quick/textureprovider/etcprovider.h
src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp
src/qml/doc/qtqml.qdocconf
src/quick/doc/qtquick.qdocconf
tests/auto/quick/qquickflickable/tst_qquickflickable.cpp
Change-Id: I5027b0ee024e00b9525bd45516b7f401ff7d4ae4
Diffstat (limited to 'examples/quick/scenegraph')
0 files changed, 0 insertions, 0 deletions