Age | Commit message (Collapse) | Author | |
---|---|---|---|
2016-09-25 | doc/libav-merge: change gmane link to a ffmpeg.org one | Clément Bœsch | |
2016-09-25 | doc: move out merge script to tools | Clément Bœsch | |
2016-09-25 | doc: remove codecpar mention in libav-merge.txt | Clément Bœsch | |
2016-08-22 | doc&tools: Add murge script, for analyzing 3 way conflicts. | Michael Niedermayer | |
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> | |||
2016-08-17 | doc: add Libav merge document | Clément Bœsch | |