Merge pull request #511 from am11/master

Submodules: Updated submodules (#510)

appveyor.yml

@@ -17,6 +17,6 @@ install:
 test_script:
   - node --version
   - npm --version
-  - ps: npm test
+  - npm test
 
 build: off

binding.gyp

@@ -8,6 +8,7 @@
         'src/libsass/ast.cpp',
         'src/libsass/base64vlq.cpp',
         'src/libsass/bind.cpp',
+        'src/libsass/cencode.c',
         'src/libsass/constants.cpp',
         'src/libsass/context.cpp',
         'src/libsass/contextualize.cpp',
@@ -19,6 +20,7 @@
         'src/libsass/file.cpp',
         'src/libsass/functions.cpp',
         'src/libsass/inspect.cpp',
+        'src/libsass/json.cpp',
         'src/libsass/node.cpp',
         'src/libsass/output_compressed.cpp',
         'src/libsass/output_nested.cpp',

libsass @ 5f3558d7

-Subproject commit ca5f271883db61ccd1d1e1b84dd4830a2564896f
+Subproject commit 5f3558d7ce36bb61202f1585ed8e32a52209e940

test/cli.js

@@ -162,7 +162,7 @@ describe('cli', function() {
     it('should compile with the --source-map option', function(done) {
       var src = fixture('source-map/index.scss');
       var dest = fixture('source-map/build.css');
-      var expected = read(fixture('source-map/expected.css'), 'utf8').trim();
+      var expected = read(fixture('source-map/expected.css'), 'utf8').trim().replace(/\r\n/g, '\n');
       var map = fixture('source-map/index.map');
       var bin = spawn(cli, [src, '--output', dest, '--source-map', map]);
 

spec @ b85c617a

-Subproject commit f01abbf6d47ec62f3248ef0aa5bd5609e2223c8a
+Subproject commit b85c617a0e7e5367dd347b0b301ad1c15b6d5087