Merge master into api_changes
[profile/ivi/qtdeclarative.git] / src / quick / items / qquickspritesequence_p.h
2012-03-05 Matthew VogtMerge remote branch 'gerrit/api_changes' into merge...
2012-03-05 Matthew VogtMerge master <-> api_changes
2012-02-28 Alan AlpertRename SpriteImage to SpriteSequence