[vlc-devel] [PATCH] Fix for trac #3452: VLC fails to compile on OS X with zlib 1.2.4

[Rémi Denis-Courmont]

On Tuesday 30 March 2010 02:33:34 Gellule Xg, you wrote:
> On 3/29/10 11:15 AM, Rémi Denis-Courmont wrote:
> > On Monday 29 March 2010 23:23:06 Gellule Xg, you wrote:
> >> This is a second version of the patch for for trac #3452: VLC fails to
> >> compile on OS X with zlib 1.2.4. The actual patch files are unchanged,
> >> but the supporting explanantion is improved.
> >
> > Please use git patch format. Patch-per-file are a pain to merge.
> 
> git patch format attached.

git patch format is the format you get from git-format-patch, not the plain 
unified diff format (from git-diff), e.g.:
$ git format-patch -n origin/master

Then grumpy and lazy committers like me simply call 'git am -s 000*.patch' and 
they're done.

-- 
Rémi Denis-Courmont