diff options
| author | Jacob Thornton <[email protected]> | 2012-01-24 14:08:27 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-24 14:08:27 -0800 |
| commit | 8db0cc6fdadb2b08cc4aaff7ef0527f69f271cc1 (patch) | |
| tree | 86bb36cdc85792428c14584f40f177bfaf0bdfae | |
| parent | f03e170054be081738493c6dace4b37a7a3d40cd (diff) | |
| parent | d80985443a2356a908e6f0d11a75a1da8ed9b36c (diff) | |
| download | bootstrap-8db0cc6fdadb2b08cc4aaff7ef0527f69f271cc1.tar.xz bootstrap-8db0cc6fdadb2b08cc4aaff7ef0527f69f271cc1.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
| -rw-r--r-- | js/bootstrap-button.js | 2 | ||||
| -rw-r--r-- | js/bootstrap-carousel.js | 2 | ||||
| -rw-r--r-- | js/bootstrap-collapse.js | 4 | ||||
| -rw-r--r-- | js/bootstrap-dropdown.js | 2 | ||||
| -rw-r--r-- | js/bootstrap-modal.js | 2 | ||||
| -rw-r--r-- | js/bootstrap-popover.js | 2 | ||||
| -rw-r--r-- | js/bootstrap-tab.js | 2 | ||||
| -rw-r--r-- | js/bootstrap-tooltip.js | 2 | ||||
| -rw-r--r-- | js/bootstrap-transition.js | 4 | ||||
| -rw-r--r-- | js/bootstrap-typeahead.js | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js index 046d25614..2461ffec6 100644 --- a/js/bootstrap-button.js +++ b/js/bootstrap-button.js @@ -1,5 +1,5 @@ /* ============================================================ - * bootstrap-buttons.js v2.0.0 + * bootstrap-button.js v2.0.0 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js index 4e12e31b5..3262f0cab 100644 --- a/js/bootstrap-carousel.js +++ b/js/bootstrap-carousel.js @@ -1,6 +1,6 @@ /* ========================================================== * bootstrap-carousel.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#alerts + * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js index 9278f66d0..ac434dcf3 100644 --- a/js/bootstrap-collapse.js +++ b/js/bootstrap-collapse.js @@ -1,6 +1,6 @@ /* ============================================================= - * bootstrap-collapsible.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#collapsible + * bootstrap-collapse.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index 923da6bfa..f9d93fc72 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -1,6 +1,6 @@ /* ============================================================ * bootstrap-dropdown.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#dropdown + * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js index 3652f5c8b..ecb7b5add 100644 --- a/js/bootstrap-modal.js +++ b/js/bootstrap-modal.js @@ -1,6 +1,6 @@ /* ========================================================= * bootstrap-modal.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#modal + * http://twitter.github.com/bootstrap/javascript.html#modals * ========================================================= * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js index a0de0f08d..57864fc6e 100644 --- a/js/bootstrap-popover.js +++ b/js/bootstrap-popover.js @@ -1,6 +1,6 @@ /* =========================================================== * bootstrap-popover.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#popover + * http://twitter.github.com/bootstrap/javascript.html#popovers * =========================================================== * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js index e5b85e232..d52be872f 100644 --- a/js/bootstrap-tab.js +++ b/js/bootstrap-tab.js @@ -1,5 +1,5 @@ /* ======================================================== - * bootstrap-tabs.js v2.0.0 + * bootstrap-tab.js v2.0.0 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js index 07a5d46f5..21f2311fb 100644 --- a/js/bootstrap-tooltip.js +++ b/js/bootstrap-tooltip.js @@ -1,6 +1,6 @@ /* =========================================================== * bootstrap-tooltip.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#tooltip + * http://twitter.github.com/bootstrap/javascript.html#tooltips * Inspired by the original jQuery.tipsy by Jason Frame * =========================================================== * Copyright 2012 Twitter, Inc. diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js index 8f6e86e44..94f1dbdf8 100644 --- a/js/bootstrap-transition.js +++ b/js/bootstrap-transition.js @@ -1,6 +1,6 @@ /* =================================================== - * bootstrap-transitions.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html + * bootstrap-transition.js v2.0.0 + * http://twitter.github.com/bootstrap/javascript.html#transitions * =================================================== * Copyright 2012 Twitter, Inc. * diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js index b8ff5aab0..f64fcca01 100644 --- a/js/bootstrap-typeahead.js +++ b/js/bootstrap-typeahead.js @@ -1,6 +1,6 @@ /* ============================================================= * bootstrap-typeahead.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#collapsible + * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= * Copyright 2012 Twitter, Inc. * |