Merge branch 'master' into win-bootstrap-native-modules

This commit is contained in:
Kevin Sawicki
2013-10-28 17:33:39 -07:00
18 changed files with 177 additions and 183 deletions

View File

@@ -14,7 +14,7 @@
"async": "0.2.6",
"bootstrap": "git://github.com/twbs/bootstrap.git#v3.0.0",
"clear-cut": "0.1.0",
"coffee-script": "1.6.2",
"coffee-script": "1.6.3",
"coffeestack": "0.6.0",
"emissary": "0.6.0",
"first-mate": "0.5.0",
@@ -23,8 +23,7 @@
"guid": "0.0.10",
"jasmine-focused": "~0.15.0",
"mkdirp": "0.3.5",
"less": "git://github.com/nathansobo/less.js.git",
"less-cache": "0.8.0",
"less-cache": "0.9.0",
"nslog": "0.1.0",
"oniguruma": "0.22.0",
"optimist": "0.4.0",
@@ -52,7 +51,7 @@
"grunt-cson": "0.5.0",
"grunt-contrib-csslint": "~0.1.2",
"grunt-contrib-coffee": "~0.7.0",
"grunt-contrib-less": "~0.6.4",
"grunt-contrib-less": "~0.8.0",
"walkdir": "0.0.7",
"ws": "0.4.27",
"js-yaml": "~2.1.0",