Merge commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba'

Browse Source

* commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba':
  doc: Sort the muxer documentation

Conflicts:
	doc/muxers.texi

No change as ours was already sorted

Merged-by: Michael Niedermayer <michaelni@gmx.at>

pull/56/merge

Michael Niedermayer 11 years ago

parent 0a30ad3473 a7b3216cbd

commit ca5b45b9b3

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available