[Buildroot] [PATCH 0/2] RWD Website

[Thomas Petazzoni]

Dear Angelo Compagnucci,

On Mon, 3 Nov 2014 11:33:05 +0100, Angelo Compagnucci wrote:

> > So if you like this way, I'll update variables.less and
> > bootswatch.less to bootstrap 3.2, then I'll recompile bootstrap, then
> > I'll send you a zip with new files to overcome smtp problems with very
> > long lines.
> 
> Attached you can find (in tar.gz format) the patch that updates
> bootstrap, theme, and source file to re-create the bootstrap.min.css
> file.

Unfortunately it still doesn't apply on top of the latest master:

thomas at skate:~/projets/buildroot (master)$ LANG=C git am -s /tmp/0001-docs-RWD-website-upgrading-bootswatch-theme-file.patch
Applying: docs: RWD website - upgrading bootswatch theme file
/home/thomas/projets/buildroot/.git/rebase-apply/patch:1659: trailing whitespace.
  
error: patch failed: docs/css/bootstrap.min.css:1
error: docs/css/bootstrap.min.css: patch does not apply
Patch failed at 0001 docs: RWD website - upgrading bootswatch theme file
The copy of the patch that failed is found in:
   /home/thomas/projets/buildroot/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com