summaryrefslogtreecommitdiffstats
path: root/doc/libav-merge.txt
Commit message (Expand)AuthorAgeFilesLines
* doc/libav-merge: add skipped fixup commits to the list of missing changesHendrik Leppkes2016-11-131-1/+1
* doc: update merge status for recent additions and skipped mergesHendrik Leppkes2016-11-131-1/+2
* doc/libav-merge: add a note for the skipped QSV functionalityHendrik Leppkes2016-10-011-0/+1
* doc/libav-merge: complete TODO sectionClément Bœsch2016-10-011-0/+10
* doc/libav-merge: change gmane link to a ffmpeg.org oneClément Bœsch2016-09-251-1/+1
* doc: move out merge script to toolsClément Bœsch2016-09-251-31/+5
* doc: remove codecpar mention in libav-merge.txtClément Bœsch2016-09-251-1/+0
* 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
OpenPOWER on IntegriCloud