diff options
author | fat <jacobthornton@gmail.com> | 2012-10-30 08:28:17 +0400 |
---|---|---|
committer | fat <jacobthornton@gmail.com> | 2012-10-30 08:28:17 +0400 |
commit | 31c1eba51bf3f5a988e7bef9da88372e673c30c2 (patch) | |
tree | f36c63804b743cf55e2f61ba55827e16c4ae8597 /Makefile | |
parent | 92e7f166e7b65259cffcf20a27984bc365dd8b48 (diff) | |
parent | 41ad16fe406956cc8604b295ae0b5f185386c595 (diff) |
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
Conflicts:
bootstrap/css/bootstrap.css
bootstrap/css/bootstrap.min.css
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -28,7 +28,7 @@ build: @echo "Compiling documentation... ${CHECK} Done" @cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js @uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js - @echo "/**\n* Bootstrap.js v2.1.2 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js + @echo "/**\n* Bootstrap.js v2.2.0 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js @cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js @rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js @echo "Compiling and minifying javascript... ${CHECK} Done" |