The branch, master has been updated
       via  21133ad758fe53f9aa4a5e78751c4db95b979291 (commit)
       via  3110a1ad1d2c873fa3cabf19019e353e8e99ad8a (commit)
      from  0acb9ffd586100797161f75824bc9fe362d5f564 (commit)


- Log -----------------------------------------------------------------
commit 21133ad758fe53f9aa4a5e78751c4db95b979291
Author:     Timothy Gu <timothyg...@gmail.com>
AuthorDate: Sat Nov 15 21:26:10 2014 -0800
Commit:     Michael Niedermayer <michae...@gmx.at>
CommitDate: Sun Nov 16 12:08:19 2014 +0100

    web/download.js: Detab
    
    Also fix the indentation of a line.
    
    Signed-off-by: Timothy Gu <timothyg...@gmail.com>

diff --git a/htdocs/js/download.js b/htdocs/js/download.js
index b4807b5..30e26a2 100644
--- a/htdocs/js/download.js
+++ b/htdocs/js/download.js
@@ -1,16 +1,16 @@
 
 $(document).ready(function() {
-       $('#build-windows').removeClass('active');
-       $('#build-mac').removeClass('active');
+    $('#build-windows').removeClass('active');
+    $('#build-mac').removeClass('active');
 
-       var f = function (e) {
-           e.preventDefault()
-           $(this).tab('show')
-       };
-       $('a[href="#build-linux"]').hover(f);
-       $('a[href="#build-windows"]').hover(f);
-       $('a[href="#build-mac"]').hover(f);
+    var f = function (e) {
+        e.preventDefault()
+        $(this).tab('show')
+    };
+    $('a[href="#build-linux"]').hover(f);
+    $('a[href="#build-windows"]').hover(f);
+    $('a[href="#build-mac"]').hover(f);
 
-       $("#get-sources").height($("#get-packages").height());
-       $("#get-packages").height($("#get-packages").height());
-    });
+    $("#get-sources").height($("#get-packages").height());
+    $("#get-packages").height($("#get-packages").height());
+});

commit 3110a1ad1d2c873fa3cabf19019e353e8e99ad8a
Author:     Timothy Gu <timothyg...@gmail.com>
AuthorDate: Sat Nov 15 21:26:09 2014 -0800
Commit:     Michael Niedermayer <michae...@gmx.at>
CommitDate: Sun Nov 16 12:08:15 2014 +0100

    web/bower.json: Detab
    
    Signed-off-by: Timothy Gu <timothyg...@gmail.com>

diff --git a/bower.json b/bower.json
index f270e16..af2d530 100644
--- a/bower.json
+++ b/bower.json
@@ -5,8 +5,8 @@
     "homepage": "http://ffmpeg.org/";,
     "main": "htdocs/style.css",
     "dependencies": {
-       "less": "1.7.3",
-       "bootstrap": "3.2.0",
-       "font-awesome": "4.1.0"
+        "less": "1.7.3",
+        "bootstrap": "3.2.0",
+        "font-awesome": "4.1.0"
     }
 }

-----------------------------------------------------------------------

Summary of changes:
 bower.json            |    6 +++---
 htdocs/js/download.js |   24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)


hooks/post-receive
-- 

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to