diff options
author | Michael Niedermayer <[email protected]> | 2014-02-19 22:06:12 +0100 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2014-02-19 22:06:12 +0100 |
commit | ca5b45b9b3cb488e6b7d76a7db8befff98acf640 (patch) | |
tree | 635f3f8e878188044411a8f8939fb4af80d71e4c | |
parent | 0a30ad34735745c0e0f1610ab43c205255527f00 (diff) | |
parent | a7b3216cbdc7796a9d14cd22a863fae3556098ba (diff) |
Merge commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba'
* commit 'a7b3216cbdc7796a9d14cd22a863fae3556098ba':
doc: Sort the muxer documentation
Conflicts:
doc/muxers.texi
No change as ours was already sorted
Merged-by: Michael Niedermayer <[email protected]>
0 files changed, 0 insertions, 0 deletions