Merge branch 'hotfix/libsass-3.4.7'

bit3 · Nov 20, 2017 · 1a2d53d · 1a2d53d
2 parents b0445cf + 5a9f41a
commit 1a2d53d
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 Java sass compiler
 ==================
 
-Feature complete java sass compiler using [libsass][libsass] version 3.4.6.
+Feature complete java sass compiler using [libsass][libsass] version 3.4.7.
 
 The most advantage of jsass is to hide the libsass complexity from the developer and provide a more java like way.
 

diff --git a/src/main/libsass b/src/main/libsass
diff --git a/src/main/resources/darwin/libjsass.dylib b/src/main/resources/darwin/libjsass.dylib
diff --git a/src/main/resources/linux-x32/libjsass.so b/src/main/resources/linux-x32/libjsass.so
diff --git a/src/main/resources/linux-x64/libjsass.so b/src/main/resources/linux-x64/libjsass.so
diff --git a/src/main/resources/windows-x32/libjsass.dll b/src/main/resources/windows-x32/libjsass.dll
diff --git a/src/main/resources/windows-x32/libsass.dll b/src/main/resources/windows-x32/libsass.dll
diff --git a/src/main/resources/windows-x64/libjsass.dll b/src/main/resources/windows-x64/libjsass.dll
diff --git a/src/main/resources/windows-x64/libsass.dll b/src/main/resources/windows-x64/libsass.dll
diff --git a/src/test/resources/darwin/libjsass_test.dylib b/src/test/resources/darwin/libjsass_test.dylib
diff --git a/src/test/resources/linux-x32/libjsass_test.so b/src/test/resources/linux-x32/libjsass_test.so
diff --git a/src/test/resources/linux-x64/libjsass_test.so b/src/test/resources/linux-x64/libjsass_test.so
diff --git a/src/test/resources/windows-x32/libjsass_test.dll b/src/test/resources/windows-x32/libjsass_test.dll
diff --git a/src/test/resources/windows-x64/libjsass_test.dll b/src/test/resources/windows-x64/libjsass_test.dll
+1 −1		GNUmakefile.am
+1 −1		Makefile
+1 −1		include/sass2scss.h
+2 −5		script/ci-install-deps
+5 −5		src/ast.cpp
+2 −2		src/bind.cpp
+1 −0		src/context.cpp
+2 −2		src/environment.cpp
+58 −7		src/eval.cpp
+9 −8		src/eval.hpp
+30 −17		src/extend.cpp
+3 −0		src/extend.hpp
+9 −3		src/file.cpp
+12 −12		src/inspect.cpp
+6 −0		src/lexer.cpp
+1 −0		src/lexer.hpp
+5 −3		src/node.cpp
+9 −6		src/parser.cpp
+12 −5		src/prelexer.cpp
+0 −1		src/prelexer.hpp
+5 −2		src/sass.hpp
+7 −5		src/util.cpp
+1 −1		src/util.hpp