Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
	docs/assets/css/bootstrap.css

.gitignore

@@ -34,3 +34,5 @@ nbproject
 
 # Misc
 js/min
+
+dist
\ No newline at end of file

Makefile

-VERSION=2.0.0
 BOOTSTRAP = ./docs/assets/css/bootstrap.css
 BOOTSTRAP_LESS = ./less/bootstrap.less
 BOOTSTRAP_RESPONSIVE = ./docs/assets/css/bootstrap-responsive.css
@@ -12,16 +11,11 @@ WATCHR ?= `which watchr`
 #
 
 build:
-	@@if test ! -z ${LESS_COMPRESSOR}; then \
-		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
-		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
-		rm -f ${BOOTSTRAP_LESS}.tmp; \
-		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"`date`"'/' <${BOOTSTRAP_RESPONSIVE_LESS} >${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
-		lessc ${BOOTSTRAP_RESPONSIVE_LESS}.tmp > ${BOOTSTRAP_RESPONSIVE}; \
-		rm -f ${BOOTSTRAP_RESPONSIVE_LESS}.tmp; \
+	@if test ! -z ${LESS_COMPRESSOR}; then \
+		lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP}; \
+		lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}; \
 		node docs/build; \
 		cp img/* docs/assets/img/; \
-		echo "Bootstrap successfully built! - `date`"; \
 	else \
 		echo "You must have the LESS compiler installed in order to build Bootstrap."; \
 		echo "You can install it by running: npm install less -g"; \
@@ -32,7 +26,7 @@ build:
 #
 
 watch:
-	@@if test ! -z ${WATCHR}; then \
+	@if test ! -z ${WATCHR}; then \
 	  echo "Watching less files..."; \
 	  watchr -e "watch('less/.*\.less') { system 'make' }"; \
 	else \
@@ -40,5 +34,4 @@ watch:
 		echo "You can install it by running: gem install watchr"; \
 	fi
 
-
 .PHONY: build watch
\ No newline at end of file

docs/assets/css/bootstrap-responsive.css

@@ -273,4 +273,4 @@
   .offset12  { .offset(12); }
 
 }
-*/
+*/
\ No newline at end of file

docs/assets/css/bootstrap.css

@@ -6,7 +6,6 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Fri Jan 27 21:07:37 PST 2012
  */
 article,
 aside,

less/bootstrap.less

 /*!
- * Bootstrap @VERSION
+ * Bootstrap v2.0.0
  *
  * 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: @DATE
  */
 
 // CSS Reset