[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Clément Bœsch]

On Tue, Jan 07, 2014 at 06:17:59PM +0100, Michael Niedermayer wrote:
> On Mon, Jan 06, 2014 at 05:56:31PM +0100, Clément Bœsch wrote:
> > On Mon, Jan 06, 2014 at 05:49:51PM +0100, Michael Niedermayer wrote:
> > > ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan  6 17:41:54 2014 +0100| [49a5912440db2925a2d4d0a89ad03f882a6e4ca1] | committer: Michael Niedermayer
> > > 
> > > Merge remote-tracking branch 'qatar/master'
> > > 
> > > * qatar/master:
> > >   configure: Update freetype check to follow upstream
> > > 
> > > Conflicts:
> > > 	configure
> > > 
> > > Not merged, as its broken (Reported by ubitux)
> > > 
> > 
> > Sorry, it's not actually broken in the way I thought it was. Apologies to
> > the author(s?).
> 
> should it be merged or not ?
> 

I have no opinion, see with Alexander (in CC)

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-cvslog/attachments/20140107/dda8a50e/attachment.asc>