summaryrefslogtreecommitdiffstats
path: root/doc/src/images/statemachine-customevents.png
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-05-18 05:06:40 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-05-18 05:06:40 (GMT)
commit3769beacd9126b567f6a42e6c357a7eda004a602 (patch)
treeaa32717de1ccf0cae336e9682d81e5a9d7e845e5 /doc/src/images/statemachine-customevents.png
parent0ed3e397eaebd1220d745c61cb3433998cbd9dd9 (diff)
parent9aba165d0ca970949bcc5fc590569ea58d992626 (diff)
downloadQt-3769beacd9126b567f6a42e6c357a7eda004a602.zip
Qt-3769beacd9126b567f6a42e6c357a7eda004a602.tar.gz
Qt-3769beacd9126b567f6a42e6c357a7eda004a602.tar.bz2
Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts: src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qvariantanimation.cpp src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'doc/src/images/statemachine-customevents.png')
-rw-r--r--doc/src/images/statemachine-customevents.pngbin0 -> 2544 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/statemachine-customevents.png b/doc/src/images/statemachine-customevents.png
new file mode 100644
index 0000000..62a4222
--- /dev/null
+++ b/doc/src/images/statemachine-customevents.png
Binary files differ