Skip to content

Commit

Permalink
Merge remote-tracking branch 'qatar/master'
Browse files Browse the repository at this point in the history
* qatar/master:
  qt-faststart: Add a note about the -movflags +faststart feature

Conflicts:
	tools/qt-faststart.c

See: 2574d62
Merged-by: Michael Niedermayer <michaelni@gmx.at>
  • Loading branch information
michaelni committed Mar 1, 2014
2 parents 06fe29c + 700687e commit 5972bcf
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 5972bcf

Please sign in to comment.