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