Merge remote branch 'qatar/master'
[ffmpeg.git] / .gitignore
2011-01-18 Janne Grunauconsolidate .gitignore patters into a single file
2011-01-17 Janne Grunauconvert svn:ignore properties to .gitignore files