diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-07 23:41:10 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-07 23:41:10 (GMT) |
| commit | f3164b608e83a3e2c54643aea984095edc275346 (patch) | |
| tree | 14b532e90e2a15b8d2ac5d46738971b0bedc561e /mkspecs | |
| parent | b7ac7f5b4d4c8e08b4ded43c9720c712a3663810 (diff) | |
| parent | 90057dabcb99759bcb42c1c21db7151c69d98706 (diff) | |
| download | Qt-f3164b608e83a3e2c54643aea984095edc275346.zip Qt-f3164b608e83a3e2c54643aea984095edc275346.tar.gz Qt-f3164b608e83a3e2c54643aea984095edc275346.tar.bz2 | |
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
Diffstat (limited to 'mkspecs')
0 files changed, 0 insertions, 0 deletions