Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
[qt:qt.git] / examples / declarative / modelviews / parallax / qml / parallax / Smiley.qml
2011-11-22 Casper van DonderenMerge remote-tracking branch 'qt-doc-review/master'
2011-11-17 artokamodelviews/parallax example modifications