9 Commits

Author	SHA1	Message	Date
Hendrik Leppkes	e3d9bd7102	doc/libav-merge: add skipped fixup commits to the list of missing changes	2016-11-13 22:34:01 +01:00
Hendrik Leppkes	53e116eeeb	doc: update merge status for recent additions and skipped merges	2016-11-13 17:29:01 +01:00
Hendrik Leppkes	3c18188f9f	doc/libav-merge: add a note for the skipped QSV functionality	2016-10-01 15:20:44 +02:00
Clément Bœsch	0fbd423905	doc/libav-merge: complete TODO section	2016-10-01 10:41:27 +02:00
Clément Bœsch	bd9e425459	doc/libav-merge: change gmane link to a ffmpeg.org one	2016-09-25 19:38:27 +02:00
Clément Bœsch	95a7cbb09d	doc: move out merge script to tools	2016-09-25 19:27:51 +02:00
Clément Bœsch	485f75b278	doc: remove codecpar mention in libav-merge.txt	2016-09-25 19:17:39 +02:00
Michael Niedermayer	360d3f3c18	doc&tools: Add murge script, for analyzing 3 way conflicts. ... Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	2016-08-22 18:54:03 +02:00
Clément Bœsch	2477775bf8	doc: add Libav merge document	2016-08-17 15:31:38 +02:00