aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-08-26 15:21:20 -0700
committerJacob Thornton <[email protected]>2011-08-26 15:21:20 -0700
commita63fb4d234941c58547ed902eb198abaee71b89c (patch)
treec23ca33948c6cf4b9cbdc8afbbcf992590b8dadf /Makefile
parent5193619ab0b5eaf937eaec01ba58f179dbc2484c (diff)
parent273659c8e754b924b1bdcab5d34b0498ce2036bd (diff)
downloadbootstrap-a63fb4d234941c58547ed902eb198abaee71b89c.tar.xz
bootstrap-a63fb4d234941c58547ed902eb198abaee71b89c.zip
Merge branch '1.1.1-wip'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 64a958f22..f4f367567 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
DATE=$(shell DATE)
-BOOTSTRAP = ./bootstrap-1.1.0.css
-BOOTSTRAP_MIN = ./bootstrap-1.1.0.min.css
+BOOTSTRAP = ./bootstrap-1.1.1.css
+BOOTSTRAP_MIN = ./bootstrap-1.1.1.min.css
BOOTSTRAP_LESS = ./lib/bootstrap.less
LESS_COMPESSOR ?= `which lessc`
WATCHR ?= `which watchr`