[vlc-devel] [PATCH] Fix typo 'allows to do' -> 'allows doing'.

[Rémi Denis-Courmont]

Le lundi 25 juillet 2011 18:18:27 Benjamin Drung, vous avez écrit :
> Am Montag, den 25.07.2011, 18:16 +0300 schrieb Rémi Denis-Courmont:
> > Le lundi 25 juillet 2011 14:51:33 Benjamin Drung, vous avez écrit :
> > > Am Sonntag, den 24.07.2011, 23:24 +0200 schrieb Jean-Baptiste Kempf:
> > > > Patch does not apply against master.
> > > 
> > > Strange, I created this patch against master and it applies cleanly
> > > with -p1 against a fresh master checkout. Maybe something went wrong
> > > with inlining the patch. This time the patch is attached.
> > 
> > Neither of the patches apply here.
> 
> What it the output of 'patch -p1 < patchfile'?

patching file modules/codec/wmafixed/bitstream.c
patching file modules/gui/macosx/embeddedwindow.h
patching file modules/gui/macosx/wizard.m
patching file modules/gui/skins2/utils/bezier.cpp
patching file modules/mmx/fastmemcpy.h
patching file modules/mux/mpeg/ts.c
patching file modules/video_filter/atmo/README.txt
Hunk #1 FAILED at 50.
Hunk #2 FAILED at 94.
2 out of 2 hunks FAILED -- saving rejects to file 
modules/video_filter/atmo/README.txt.rej
patching file modules/video_filter/atmo/atmo.cpp
patching file modules/video_filter/crop.c
patching file modules/video_output/msw/directx.c
patching file src/input/clock.h
patching file src/libvlc-module.c

I merged the mergeable chunks anyway.

-- 
Rémi Denis-Courmont
http://www.remlab.net/
http://fi.linkedin.com/in/remidenis