From 403d6c1ee7797606091bce77174843b48c545a36 Mon Sep 17 00:00:00 2001
From: Adeel <adeelbm@outlook.com>
Date: Wed, 5 Nov 2014 11:52:42 +0200
Subject: [PATCH] Submodules: Updated submodules. (#510) * Additions in the
 binding.gyp. * Updated CLI test for line endings. * Updated Appveyor.yml as
 per @FeodorFitsner's   suggestion.

---
 appveyor.yml       | 2 +-
 binding.gyp        | 2 ++
 src/libsass        | 2 +-
 test/cli.js        | 2 +-
 test/fixtures/spec | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 99d97f0f9..dcee6d15b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -17,6 +17,6 @@ install:
 test_script:
   - node --version
   - npm --version
-  - ps: npm test
+  - npm test
 
 build: off
diff --git a/binding.gyp b/binding.gyp
index 6b8e506bb..743888f5a 100644
--- a/binding.gyp
+++ b/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',
diff --git a/src/libsass b/src/libsass
index ca5f27188..5f3558d7c 160000
--- a/src/libsass
+++ b/src/libsass
@@ -1 +1 @@
-Subproject commit ca5f271883db61ccd1d1e1b84dd4830a2564896f
+Subproject commit 5f3558d7ce36bb61202f1585ed8e32a52209e940
diff --git a/test/cli.js b/test/cli.js
index 5dae48047..2e42d4c7f 100644
--- a/test/cli.js
+++ b/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]);
 
diff --git a/test/fixtures/spec b/test/fixtures/spec
index f01abbf6d..b85c617a0 160000
--- a/test/fixtures/spec
+++ b/test/fixtures/spec
@@ -1 +1 @@
-Subproject commit f01abbf6d47ec62f3248ef0aa5bd5609e2223c8a
+Subproject commit b85c617a0e7e5367dd347b0b301ad1c15b6d5087