Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinet...
authorMichael Brasser <michael.brasser@nokia.com>
Thu, 7 May 2009 23:41:10 +0000 (09:41 +1000)
committerMichael Brasser <michael.brasser@nokia.com>
Thu, 7 May 2009 23:41:10 +0000 (09:41 +1000)
commitf3164b608e83a3e2c54643aea984095edc275346
tree14b532e90e2a15b8d2ac5d46738971b0bedc561e
parentb7ac7f5b4d4c8e08b4ded43c9720c712a3663810
parent90057dabcb99759bcb42c1c21db7151c69d98706
Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

Conflicts:
src/corelib/animation/qabstractanimation.cpp
src/corelib/animation/qabstractanimation_p.h
src/corelib/animation/qpropertyanimation.cpp
src/corelib/animation/qabstractanimation.cpp
src/corelib/animation/qabstractanimation_p.h
src/corelib/animation/qvariantanimation.cpp
src/corelib/kernel/qcoreevent.cpp