[Pkg-javascript-commits] [less.js] 13/285: Merge branch 'master' into 2_0_0

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag v2.0.0
in repository less.js.

commit f0d0ac965d76ff1b9db568d61cd0da86868fa0e9
Merge: d846774 5ab0e08
Author: Luke Page <luke.a.page at gmail.com>
Date:   Sat Feb 22 15:31:32 2014 +0000

    Merge branch 'master' into 2_0_0
    
    Conflicts:
    	package.json

 README.md                                          | 304 +--------------------
 bin/lessc                                          |  29 +-
 build/README.md                                    | 304 +--------------------
 build/build.yml                                    |   2 +
 lib/less/functions.js                              |  16 +-
 lib/less/index.js                                  |   2 +
 lib/less/parser.js                                 | 131 +++++++--
 lib/less/tree/detached-ruleset.js                  |  20 ++
 lib/less/tree/media.js                             |   3 +
 lib/less/tree/mixin.js                             |  13 +-
 lib/less/tree/rule.js                              |  18 +-
 lib/less/tree/ruleset-call.js                      |  16 ++
 lib/less/tree/ruleset.js                           |  67 +++--
 package.json                                       |  18 +-
 test/css/detached-rulesets.css                     |  71 +++++
 test/css/functions.css                             |   8 +
 test/css/import-reference.css                      |  27 +-
 test/css/scope.css                                 |   3 +
 test/less/css-guards.less                          |   3 +
 test/less/detached-rulesets.less                   | 103 +++++++
 test/less/errors/detached-ruleset-1.less           |   6 +
 test/less/errors/detached-ruleset-1.txt            |   4 +
 test/less/errors/detached-ruleset-2.less           |   6 +
 test/less/errors/detached-ruleset-2.txt            |   4 +
 test/less/errors/detached-ruleset-3.less           |   4 +
 test/less/errors/detached-ruleset-3.txt            |   4 +
 test/less/errors/detached-ruleset-4.less           |   5 +
 test/less/errors/detached-ruleset-4.txt            |   3 +
 test/less/errors/detached-ruleset-5.less           |   4 +
 test/less/errors/detached-ruleset-5.txt            |   3 +
 test/less/errors/detached-ruleset-6.less           |   5 +
 test/less/errors/detached-ruleset-6.txt            |   4 +
 test/less/errors/mixin-not-visible-in-scope-1.less |   9 +
 test/less/errors/mixin-not-visible-in-scope-1.txt  |   4 +
 test/less/functions.less                           |  10 +-
 test/less/import-reference.less                    |  11 +-
 test/less/import/import-reference.less             |   8 +
 test/less/scope.less                               |  25 ++
 38 files changed, 581 insertions(+), 696 deletions(-)

diff --cc package.json
index 060a765,d79d9f9..8e91bbf
--- a/package.json
+++ b/package.json
@@@ -51,16 -51,15 +51,16 @@@
      "grunt": "~0.4.2",
      "grunt-contrib-clean": "~0.5.0",
      "grunt-contrib-concat": "~0.3.0",
-     "grunt-contrib-connect": "~0.3.0",
+     "grunt-contrib-connect": "~0.6.0",
      "grunt-contrib-jasmine": "~0.5.2",
-     "grunt-contrib-jshint": "~0.7.2",
-     "grunt-contrib-uglify": "~0.2.7",
-     "grunt-shell": "~0.3.1",
-     "http-server": "~0.5.5",
-     "matchdep": "~0.1.2",
-     "time-grunt": "~0.1.1",
+     "grunt-contrib-jshint": "~0.8.0",
+     "grunt-contrib-uglify": "~0.3.2",
+     "grunt-shell": "~0.6.4",
+     "http-server": "~0.6.1",
+     "matchdep": "~0.3.0",
 -    "time-grunt": "~0.2.9"
 - },
++    "time-grunt": "~0.2.9",
 +    "grunt-contrib-copy": "~0.4.1"
 +  },
    "keywords": [
      "compile less",
      "css nesting",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/less.js.git