Am Samstag, 25. Juni 2016 um 18:34:14, schrieb Liviu Andronic <landr...@lyx.org> > On Sat, Jun 25, 2016 at 6:29 PM, Kornel Benko <kor...@lyx.org> wrote: > > Am Samstag, 25. Juni 2016 um 18:23:03, schrieb Liviu Andronic > > <landr...@lyx.org> > >> On Sat, Jun 25, 2016 at 6:00 PM, Richard Heck <rgh...@lyx.org> wrote: > >> > I've fixed both these issues with the attached. > >> > > >> I have trouble applying this patch. I've tried everything from patch > >> -p1 < filename.patch to git apply filename.patch on a clean tree and > >> it fails. > > > > I had no problems with this in master branch. The only difference was > > patching file src/frontends/qt4/GuiView.cpp > > Hunk #9 succeeded at 4236 (offset 5 lines). > > Hunk #10 succeeded at 4374 (offset 5 lines). > > > > I also get this, but the patch doesn't seem to apply cleanly: > > sh>patch -p1 < "0001-Initial-work-for-inset-toolbar-combo2.patch" (7483) > (Stripping trailing CRs from patch; use --binary to disable.)
I do not see ANY CR in this file (with 'od -x'), each line is delimited with LF
here.
Are you on Windows?
You may need to convert the line endings first it that is the case.
Kornel
signature.asc
Description: This is a digitally signed message part.
