Merge remote-tracking branch 'upstream/master' into bow_desc
[profile/ivi/opencv.git] / 3rdparty / .gitattributes
1 * -whitespace