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