aboutsummaryrefslogtreecommitdiffstats
path: root/doc/libav-merge.txt
Commit message (Expand)AuthorAgeFilesLines
* doc&tools: Add murge script, for analyzing 3 way conflicts.Michael Niedermayer2016-08-221-0/+4
* doc: add Libav merge documentClément Bœsch2016-08-171-0/+110