Commit fe107d37 by Brett Wilkins

Merge branch 'master' of https://github.com/msokk/node-sass into merge-96

Have left the linux-x64 binary as it was for the time being, as it needs to
be updated with new-api bindings.

Conflicts:
	precompiled/linux-x64/binding.node
parents 7caffda6 9713c078
Subproject commit 9c05850487ecc5ca187d204fcb9b1f443d66f0bf Subproject commit a83ea468515f875d2a15791b25c5eb529cd12873
This diff was suppressed by a .gitattributes entry.
...@@ -10,7 +10,12 @@ var scssStr = '#navbar {\ ...@@ -10,7 +10,12 @@ var scssStr = '#navbar {\
#navbar li {\ #navbar li {\
float: left;\ float: left;\
a {\ a {\
font-weight: bold; }}'; font-weight: bold; }}\
@mixin keyAnimation($name, $attr, $value) {\
@-webkit-keyframes #{$name} {\
0% { #{$attr}: $value; }\
}\
}';
// Note that the bad // Note that the bad
var badInput = '#navbar \n\ var badInput = '#navbar \n\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment