Merge remote-tracking branch 'qatar/master'
[ffmpeg.git] / library.mak
similarity index 100%
rename from subdir.mak
rename to library.mak