diff options
| author | Mark Otto <[email protected]> | 2012-08-15 14:45:41 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-08-15 14:45:41 -0700 |
| commit | fd509cb370867d6a2d2ad45d3bae88d4fecdd088 (patch) | |
| tree | eabc447b12d1cc05b5922db475d2b0b3e5071d04 /Makefile | |
| parent | ada5589184550ea87b37ae3cba9edfce57c04e99 (diff) | |
| parent | 74bda55d4caa3fd68b5993e5301cf2cc03fb48e8 (diff) | |
| download | bootstrap-fd509cb370867d6a2d2ad45d3bae88d4fecdd088.tar.xz bootstrap-fd509cb370867d6a2d2ad45d3bae88d4fecdd088.zip | |
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -26,7 +26,7 @@ build: @cp js/*.js docs/assets/js/ @cp js/tests/vendor/jquery.js docs/assets/js/ @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 > docs/assets/js/bootstrap.js + @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 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 |