Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
[qt:digia-qt.git] / imports /
drwxr-xr-x   ..
-rw-r--r-- 35 .gitignore