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>

...

This commit is contained in:

Michael Niedermayer

2014-02-19 22:06:12 +01:00

parent 0a30ad3473 a7b3216cbd

commit ca5b45b9b3

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

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available