« Previous | Next » 

Revision 707e8612

ID707e8612e85ba83fcbbfc56be3f4ab24af7e98fb
Parent b5f20892, 8ce67bca
Child 3acc44b7

Added by Michael Niedermayer about 9 years ago

Merge remote branch 'qatar/master'

  • qatar/master:
    Implement fate-rsync target
    Make ffmpeg support generic data stream

Conflicts:
cmdutils.h

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted