[FFmpeg-devel] [PATCH] web: Update Bower dependencies

[Timothy Gu]

On Thu, Dec 4, 2014 at 4:22 AM, Michael Niedermayer <michaelni at gmx.at> wrote:
> On Wed, Dec 03, 2014 at 08:56:11PM -0800, Timothy Gu wrote:
>> On Tue, Nov 25, 2014 at 7:50 PM, Timothy Gu <timothygu99 at gmail.com> wrote:
>> > Also explicitly add jQuery as a dependency. It is copied from the Makefile.
>> >
>> > Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
>> > ---
>> >  bower.json                            |   9 +-
>> >  htdocs/css/bootstrap.min.css          |   4 +-
>> >  htdocs/css/font-awesome.min.css       |   4 +-
>> >  htdocs/fonts/FontAwesome.otf          | Bin 75188 -> 85908 bytes
>> >  htdocs/fonts/fontawesome-webfont.eot  | Bin 72449 -> 56006 bytes
>> >  htdocs/fonts/fontawesome-webfont.svg  | 942 +++++++++++++++++-----------------
>> >  htdocs/fonts/fontawesome-webfont.ttf  | Bin 141564 -> 112160 bytes
>> >  htdocs/fonts/fontawesome-webfont.woff | Bin 83760 -> 65452 bytes
>> >  htdocs/js/bootstrap.min.js            |   5 +-
>> >  9 files changed, 491 insertions(+), 473 deletions(-)
>>
>> Ping.
>
> Applying: web: Update Bower dependencies
> fatal: corrupt patch at line 273
>
> patching file bower.json
> patching file htdocs/css/bootstrap.min.css

It's probably just your mail client, as I tried applying the mail and
it applies cleanly.

Trying again with MIME attachment.

You can also merge it from https://github.com/TimothyGu/ffmpeg-web.git
branch master.

Timothy