Vladimir Pantelic <[email protected]> writes:

> see $topic, as discussed at VDD between libav and FFmpeg developers
>
> From f9dbf678a809cdcf8056b982ae179073e79e356c Mon Sep 17 00:00:00 2001
> From: Vladimir Pantelic <[email protected]>
> Date: Sat, 3 Sep 2011 17:23:40 +0200
> Subject: [PATCH] remove references to past conflicts in the conflict 
> resolution section
>
> ---
>  src/about |    9 ++-------
>  1 files changed, 2 insertions(+), 7 deletions(-)

Looks good.

-- 
Måns Rullgård
[email protected]
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to