diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-01-21 15:33:57 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-01-21 15:33:57 (GMT) |
| commit | 226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22 (patch) | |
| tree | 491c25c4c9f08b6ef732a9179d2e64776a9e8446 /doc/src/declarative/pics/flipable.gif | |
| parent | 84a1df764bf2e29e9e6e43f4f0e1a69201199fbc (diff) | |
| parent | 59a35a794e433f9526aff72025c0899e76ef362e (diff) | |
| download | Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.zip Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.tar.gz Qt-226d63d6e90bdfdf296f5fed1d5c8b01b4e0cf22.tar.bz2 | |
Merge branch '4.7' into qdoc-simplified
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/util/qdeclarativeanimation.cpp
Diffstat (limited to 'doc/src/declarative/pics/flipable.gif')
| -rw-r--r-- | doc/src/declarative/pics/flipable.gif | bin | 131710 -> 131710 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/declarative/pics/flipable.gif b/doc/src/declarative/pics/flipable.gif Binary files differindex da37b2b..6af46c3 100644 --- a/doc/src/declarative/pics/flipable.gif +++ b/doc/src/declarative/pics/flipable.gif |
