From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 0/2] RWD Website
Date: Tue, 25 Nov 2014 19:35:34 +0100 [thread overview]
Message-ID: <20141125193534.00c099d9@free-electrons.com> (raw)
In-Reply-To: <CA+TH9Vm556YroUf1zQWbaRRb63ruDLWpK5RjpTxZhUpvXKn9Xw@mail.gmail.com>
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
next prev parent reply other threads:[~2014-11-25 18:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-31 15:50 [Buildroot] [PATCH 0/2] RWD Website Angelo Compagnucci
2014-10-31 15:50 ` [Buildroot] [PATCH 1/2] docs: RWD website - upgrading bootstrap/jquery Angelo Compagnucci
2014-10-31 15:50 ` [Buildroot] [PATCH 2/2] docs: RWD website Angelo Compagnucci
2014-11-01 13:43 ` [Buildroot] [PATCH 0/2] RWD Website Thomas Petazzoni
2014-11-02 21:14 ` Angelo Compagnucci
2014-11-02 21:54 ` Thomas Petazzoni
2014-11-03 7:53 ` Angelo Compagnucci
2014-11-03 9:29 ` Angelo Compagnucci
2014-11-03 10:33 ` Angelo Compagnucci
2014-11-25 18:35 ` Thomas Petazzoni [this message]
2014-12-02 17:36 ` Angelo Compagnucci
2014-12-02 17:50 ` Angelo Compagnucci
2014-12-02 22:17 ` Peter Korsgaard
2014-11-03 20:38 ` Arnout Vandecappelle
2014-11-04 8:34 ` Angelo Compagnucci
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141125193534.00c099d9@free-electrons.com \
--to=thomas.petazzoni@free-electrons.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox