[FFmpeg-devel] [PATCH] doc&tools: Add murge script, for analyzing 3 way conflicts.

[Michael Niedermayer]

On Mon, Aug 22, 2016 at 06:39:24PM +0200, Nicolas George wrote:
> Le sextidi 6 fructidor, an CCXXIV, Michael Niedermayer a écrit :
> > nicolas, ok if i apply it as is ?
> 
> Just like Clément, I was only pointing possible avenues for enhancement.

ok

applied

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I have never wished to cater to the crowd; for what I know they do not
approve, and what they approve I do not know. -- Epicurus
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160822/ad8e9cd6/attachment.sig>