From 268f20e84c812de9eb2cbe13261c6fe70f591857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20B=C3=B8ndergaard?= <danielboendergaard@gmail.com>
Date: Fri, 8 Nov 2013 11:55:06 +0100
Subject: Carousel: Use the transition duration from CSS

This makes it possible to change the transition duration in CSS
---
 js/carousel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/carousel.js')

diff --git a/js/carousel.js b/js/carousel.js
index 902d4d781..08a45a4f5 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -141,7 +141,7 @@
           that.sliding = false
           setTimeout(function () { that.$element.trigger('slid') }, 0)
         })
-        .emulateTransitionEnd(600)
+        .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
     } else {
       this.$element.trigger(e)
       if (e.isDefaultPrevented()) return
-- 
cgit v1.2.3


From e8e60ae4bce85eed17c7e6801b72404494ef436a Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 18 Dec 2013 14:56:08 -0800
Subject: version bump

---
 js/carousel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/carousel.js')

diff --git a/js/carousel.js b/js/carousel.js
index 3c2e21b6f..67cf0e569 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: carousel.js v3.0.3
+ * Bootstrap: carousel.js v3.1.0
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
-- 
cgit v1.2.3


From df3716647dcebc1af8abe6a2a0d5b28da687aac0 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 18 Dec 2013 15:28:08 -0800
Subject: update licensing header in JS files & run grunt

---
 js/carousel.js | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'js/carousel.js')

diff --git a/js/carousel.js b/js/carousel.js
index b55184bc4..9ac7c6a2c 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -3,18 +3,7 @@
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-- 
cgit v1.2.3