Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE2
-rw-r--r--README.md2
-rw-r--r--bootstrap.css4
-rw-r--r--examples/container-app.html2
-rw-r--r--examples/fluid-reverse.html2
-rw-r--r--examples/fluid.html2
-rw-r--r--examples/hero.html2
-rw-r--r--js/bootstrap-alert.js2
-rw-r--r--js/bootstrap-button.js2
-rw-r--r--js/bootstrap-carousel.js2
-rw-r--r--js/bootstrap-collapse.js2
-rw-r--r--js/bootstrap-dropdown.js2
-rw-r--r--js/bootstrap-modal.js2
-rw-r--r--js/bootstrap-popover.js2
-rw-r--r--js/bootstrap-scrollspy.js2
-rw-r--r--js/bootstrap-tab.js2
-rw-r--r--js/bootstrap-tooltip.js2
-rw-r--r--js/bootstrap-transition.js2
-rw-r--r--js/bootstrap-typeahead.js2
-rw-r--r--js/tests/vendor/jquery.js4
-rw-r--r--js/tests/vendor/qunit.css2
-rw-r--r--js/tests/vendor/qunit.js2
-rw-r--r--lib/bootstrap.less2
-rw-r--r--lib/print.less2
24 files changed, 26 insertions, 26 deletions
diff --git a/LICENSE b/LICENSE
index 50a6393c06..1ec0d70dea 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2011 Twitter, Inc.
+Copyright 2012 Twitter, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index fd97265840..b77eb95ae0 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ Authors
Copyright and license
---------------------
-Copyright 2011 Twitter, Inc.
+Copyright 2012 Twitter, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this work except in compliance with the License.
diff --git a/bootstrap.css b/bootstrap.css
index dd82e1247a..9a4e6e1111 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -1,12 +1,12 @@
/*!
* Bootstrap v2.0.0
*
- * Copyright 2011 Twitter, Inc
+ * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sat Jan 14 21:26:13 PST 2012
+ * Date: Sat Jan 14 23:28:07 PST 2012
*/
html, body {
margin: 0;
diff --git a/examples/container-app.html b/examples/container-app.html
index 778bceacf6..788efcbf32 100644
--- a/examples/container-app.html
+++ b/examples/container-app.html
@@ -110,7 +110,7 @@
</div>
<footer>
- <p>&copy; Company 2011</p>
+ <p>&copy; Company 2012</p>
</footer>
</div> <!-- /container -->
diff --git a/examples/fluid-reverse.html b/examples/fluid-reverse.html
index 61aa08de99..c03cae723f 100644
--- a/examples/fluid-reverse.html
+++ b/examples/fluid-reverse.html
@@ -119,7 +119,7 @@
<hr>
<footer>
- <p>&copy; Company 2011</p>
+ <p>&copy; Company 2012</p>
</footer>
</div>
</div>
diff --git a/examples/fluid.html b/examples/fluid.html
index bba78a329b..cb00fb85af 100644
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -119,7 +119,7 @@
<hr>
<footer>
- <p>&copy; Company 2011</p>
+ <p>&copy; Company 2012</p>
</footer>
</div>
</div>
diff --git a/examples/hero.html b/examples/hero.html
index 3a7a539839..9b82ba62a3 100644
--- a/examples/hero.html
+++ b/examples/hero.html
@@ -70,7 +70,7 @@
</div>
<footer>
- <p>&copy; Company 2011</p>
+ <p>&copy; Company 2012</p>
</footer>
</div> <!-- /container -->
diff --git a/js/bootstrap-alert.js b/js/bootstrap-alert.js
index 1ce8f01bff..96b9786aa7 100644
--- a/js/bootstrap-alert.js
+++ b/js/bootstrap-alert.js
@@ -2,7 +2,7 @@
* bootstrap-alert.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-button.js b/js/bootstrap-button.js
index cb0c45cdf1..046d256142 100644
--- a/js/bootstrap-button.js
+++ b/js/bootstrap-button.js
@@ -2,7 +2,7 @@
* bootstrap-buttons.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-carousel.js b/js/bootstrap-carousel.js
index c49f89ad80..f2d5110a4e 100644
--- a/js/bootstrap-carousel.js
+++ b/js/bootstrap-carousel.js
@@ -2,7 +2,7 @@
* bootstrap-carousel.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index 9301c7309d..2521b7c7a7 100644
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -2,7 +2,7 @@
* bootstrap-collapsible.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#collapsible
* =============================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
index 3cb2619929..923da6bfa6 100644
--- a/js/bootstrap-dropdown.js
+++ b/js/bootstrap-dropdown.js
@@ -2,7 +2,7 @@
* bootstrap-dropdown.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#dropdown
* ============================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-modal.js b/js/bootstrap-modal.js
index df4f3c7643..3652f5c8b5 100644
--- a/js/bootstrap-modal.js
+++ b/js/bootstrap-modal.js
@@ -2,7 +2,7 @@
* bootstrap-modal.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#modal
* =========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index 9f60cbe957..e908998952 100644
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@ -2,7 +2,7 @@
* bootstrap-popover.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#popover
* ===========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-scrollspy.js b/js/bootstrap-scrollspy.js
index 6201d4cefa..63195b4bdf 100644
--- a/js/bootstrap-scrollspy.js
+++ b/js/bootstrap-scrollspy.js
@@ -2,7 +2,7 @@
* bootstrap-scrollspy.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-tab.js b/js/bootstrap-tab.js
index 8492fe9558..e5b85e2325 100644
--- a/js/bootstrap-tab.js
+++ b/js/bootstrap-tab.js
@@ -2,7 +2,7 @@
* bootstrap-tabs.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index 8ce30ab82d..07a5d46f56 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -3,7 +3,7 @@
* http://twitter.github.com/bootstrap/javascript.html#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js
index 29fa1bdebc..aaaee4bd28 100644
--- a/js/bootstrap-transition.js
+++ b/js/bootstrap-transition.js
@@ -2,7 +2,7 @@
* bootstrap-transitions.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html
* ===================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index 180466a74b..b4957c3f61 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -2,7 +2,7 @@
* bootstrap-typeahead.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#collapsible
* =============================================================
- * Copyright 2011 Twitter, Inc.
+ * Copyright 2012 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/js/tests/vendor/jquery.js b/js/tests/vendor/jquery.js
index 01fbe13c82..4c7013a87d 100644
--- a/js/tests/vendor/jquery.js
+++ b/js/tests/vendor/jquery.js
@@ -1461,7 +1461,7 @@ jQuery.support = (function() {
// Check if div with explicit width and no margin-right incorrectly
// gets computed margin-right based on width of container. For more
// info see bug #3333
- // Fails in WebKit before Feb 2011 nightlies
+ // Fails in WebKit before Feb 2012 nightlies
// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
if ( window.getComputedStyle ) {
marginDiv = document.createElement( "div" );
@@ -3837,7 +3837,7 @@ jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblcl
/*!
* Sizzle CSS Selector Engine
- * Copyright 2011, The Dojo Foundation
+ * Copyright 2012, The Dojo Foundation
* Released under the MIT, BSD, and GPL Licenses.
* More information: http://sizzlejs.com/
*/
diff --git a/js/tests/vendor/qunit.css b/js/tests/vendor/qunit.css
index 800dac541b..b3e3d002d7 100644
--- a/js/tests/vendor/qunit.css
+++ b/js/tests/vendor/qunit.css
@@ -3,7 +3,7 @@
*
* http://docs.jquery.com/QUnit
*
- * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Copyright (c) 2012 John Resig, Jörn Zaefferer
* Dual licensed under the MIT (MIT-LICENSE.txt)
* or GPL (GPL-LICENSE.txt) licenses.
*/
diff --git a/js/tests/vendor/qunit.js b/js/tests/vendor/qunit.js
index 9047f97a01..46c95b298e 100644
--- a/js/tests/vendor/qunit.js
+++ b/js/tests/vendor/qunit.js
@@ -3,7 +3,7 @@
*
* http://docs.jquery.com/QUnit
*
- * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Copyright (c) 2012 John Resig, Jörn Zaefferer
* Dual licensed under the MIT (MIT-LICENSE.txt)
* or GPL (GPL-LICENSE.txt) licenses.
*/
diff --git a/lib/bootstrap.less b/lib/bootstrap.less
index 43b5120863..db6a192f59 100644
--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
@@ -1,7 +1,7 @@
/*!
* Bootstrap @VERSION
*
- * Copyright 2011 Twitter, Inc
+ * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
diff --git a/lib/print.less b/lib/print.less
index b45d016fdd..4fd45e2822 100644
--- a/lib/print.less
+++ b/lib/print.less
@@ -1,7 +1,7 @@
/*!
* Bootstrap @VERSION for Print
*
- * Copyright 2011 Twitter, Inc
+ * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*