Merge remote branch 'gerrit/api_changes' into merge-master
[profile/ivi/qtdeclarative.git] / .gitattributes
1 .tag ident
2 *_crlf.*        eol=crlf