Merge remote branch 'gerrit/api_changes' into merge-master
[profile/ivi/qtdeclarative.git] / imports /
drwxr-xr-x   ..
-rw-r--r-- 35 .gitignore