Merge commit '7c25ffe070c286874a8c3513f7504b90e1626b0c'
[ffmpeg.git] / .gitattributes
2014-11-30 Michael NiedermayerMerge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'
2014-11-28 Reinhard TartlerTreat all '*.pnm' files as non-text file