Merge 209ff94 into c06ff0f

sass · Apr 20, 2015 · 35185c0 · 35185c0
2 parents c06ff0f + 209ff94
commit 35185c0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "node-sass",
-  "version": "3.0.0-beta.5",
-  "libsass": "3.2.0-beta.5",
+  "version": "3.0.0-beta.6",
+  "libsass": "3.2.0-beta.6",
   "description": "Wrapper around libsass",
   "license": "MIT",
   "homepage": "https://github.com/sass/node-sass",

diff --git a/src/libsass b/src/libsass
diff --git a/test/fixtures/source-map/expected.map b/test/fixtures/source-map/expected.map
@@ -5,6 +5,6 @@
 		"index.scss"
 	],
 	"sourcesContent": [],
-	"mappings": "AAAO,OAAO,CAAN;EACN,KAAK,EAAE,GAAI;EACX,MAAM,EAAE,IAAI,GAFL;;AAKC,OAAO,CAAC,EAAE,CAAT;EACT,eAAe,EAAE,IAAK,GADZ;;AAIF,OAAO,CAAC,EAAE,CAAT;EACT,KAAK,EAAE,IAAK,GADF;EAGT,OAAO,CAAC,EAAE,CAAC,CAAC,CAAX;IACA,WAAW,EAAE,IAAK,GADjB",
+	"mappings": "AAAA,OAAO,CAAC;EACN,KAAK,EAAE,GAAI;EACX,MAAM,EAAE,IAAI,GAFL;;AAKD,OAAO,CAAC,EAAE,CAAP;EACT,eAAe,EAAE,IAAK,GADZ;;AAIJ,OAAO,CAAC,EAAE,CAAP;EACT,KAAK,EAAE,IAAK,GADF;EAGV,OAAO,CAAC,EAAE,CAAC,CAAC,CAAV;IACA,WAAW,EAAE,IAAK,GADjB",
 	"names": []
 }
diff --git a/test/fixtures/spec b/test/fixtures/spec
+2 −0		.travis.yml
+9 −3		Makefile
+1 −0		Readme.md
+9 −0		ast.cpp
+50 −4		ast.hpp
+2 −2		backtrace.hpp
+1 −1		constants.cpp
+195 −69		debugger.hpp
+2 −6		environment.hpp
+50 −10		eval.cpp
+47 −10		expand.cpp
+14 −5		functions.cpp
+132 −135		json.cpp
+25 −10		lexer.hpp
+19 −17		parser.cpp
+9 −3		parser.hpp
+1 −0		position.hpp
+19 −14		prelexer.cpp
+3 −3		script/ci-build-libsass
+24 −1		util.cpp
+4 −0		util.hpp