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

[Michael Niedermayer]

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
patch: **** malformed patch at line 46:  tgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I have often repented speaking, but never of holding my tongue.
-- Xenocrates
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20141204/cb373ecb/attachment.asc>