Merge commit 'c47037c7a17e4026d38dfa41da27b9f91506725b'
[ffmpeg.git] / tests / ffserver.conf
2009-03-29 Diego BiurrunRename test.conf --> ffserver.conf, the new name is...