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.
>git apply "0001-Initial-work-for-inset-toolbar-combo2.patch" (7324)
0001-Initial-work-for-inset-toolbar-combo2.patch:28: trailing whitespace.
Separator0001-Initial-work-for-inset-toolbar-combo2.patch:29: trailing
whitespace.
Insets0001-Initial-work-for-inset-toolbar-combo2.patch:41: trailing whitespace.
#include "InsetCombo.h"0001-Initial-work-for-inset-toolbar-combo2.patch:49:
trailing whitespace.
case ToolbarItem::INSETS:
{0001-Initial-work-for-inset-toolbar-combo2.patch:50: trailing
whitespace.
InsetCombo * insets = owner_.getInsetCombo();fatal: git apply: bad
git-diff - expected /dev/null on line 187
>git apply "0001-Initial-work-for-inset-toolbar-combo2.patch" (7324) returned
>'128'
Any pointers?
Thanks,
Liviu
> Richard
>
