Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinet...
authorDavid Boddie <dboddie@trolltech.com>
Tue, 12 May 2009 17:33:26 +0000 (19:33 +0200)
committerDavid Boddie <dboddie@trolltech.com>
Tue, 12 May 2009 17:33:26 +0000 (19:33 +0200)
commit145f445b6c7fa5546540c07f3bda493f4f825caf
tree562fe324044cdc85b65b776ec84e45b0b44f4fa0
parentb467246eb63ec649ad2348ac9b6886ee20dfc033
parent0cd84ffef786310c12cf7bd314a8922ac1aca1c0
Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-animations
src/corelib/animation/qanimationgroup.cpp
src/gui/statemachine/qbasickeyeventtransition.cpp
src/gui/statemachine/qbasicmouseeventtransition.cpp