diff options
| author | Jacob Thornton <[email protected]> | 2011-09-02 21:04:25 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-02 21:04:25 -0700 |
| commit | 0e13f8dca10ff19397d577b0916a72129183bfeb (patch) | |
| tree | 94840c00948c1b9844be7db18b8c1623100639bd /Makefile | |
| parent | b4a84e1e7de1e5448cf9adc61a1a02badec80439 (diff) | |
| parent | 2589c0ac4ecc86feed81cfc5df344e0eb78cda64 (diff) | |
| download | bootstrap-0e13f8dca10ff19397d577b0916a72129183bfeb.tar.xz bootstrap-0e13f8dca10ff19397d577b0916a72129183bfeb.zip | |
Merge branch 'master' of github.com:twitter/bootstrap into js-examples
Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less
lib/scaffolding.less
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,6 +1,6 @@ DATE=$(shell DATE) -BOOTSTRAP = ./bootstrap-1.1.1.css -BOOTSTRAP_MIN = ./bootstrap-1.1.1.min.css +BOOTSTRAP = ./bootstrap-1.2.0.css +BOOTSTRAP_MIN = ./bootstrap-1.2.0.min.css BOOTSTRAP_LESS = ./lib/bootstrap.less LESS_COMPESSOR ?= `which lessc` WATCHR ?= `which watchr` |