[Pkg-javascript-commits] [less.js] 253/285: Merge branch 'master' into sauce

[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 1ab7bbce4143c1517229e8935460303f501131e4
Merge: 765f876 6d68337
Author: Luke Page <luke.a.page at gmail.com>
Date:   Sat Nov 1 18:51:21 2014 +0000

    Merge branch 'master' into sauce
    
    Conflicts:
    	package.json

 CHANGELOG.md                                  |  25 +-
 Gruntfile.js                                  |   8 +-
 bower.json                                    |   2 +-
 dist/less.js                                  | 691 +++++++++++++++++---------
 dist/less.min.js                              |  11 +-
 lib/less-browser/add-default-options.js       |  42 ++
 lib/less-browser/bootstrap.js                 |  24 +
 lib/less-browser/browser.js                   |   7 +
 lib/less-browser/file-manager.js              |  11 +-
 lib/less-browser/index.js                     |  84 +---
 lib/less-browser/utils.js                     |  11 +
 lib/less-node/plugin-loader.js                |   5 +
 lib/less/data/colors.js                       |   1 +
 lib/less/environment/abstract-file-manager.js |   6 +-
 lib/less/index.js                             |   2 +-
 lib/less/tree/import.js                       |  11 +
 lib/less/tree/quoted.js                       |   3 +
 lib/less/tree/ruleset.js                      |  10 +
 lib/less/visitors/import-sequencer.js         |  48 ++
 lib/less/visitors/import-visitor.js           | 170 ++++---
 lib/less/visitors/to-css-visitor.js           |  12 +-
 lib/less/visitors/visitor.js                  |   7 +
 package.json                                  |   8 +-
 test/browser/runner-main-spec.js              |   3 +
 test/less/import-interpolation.less           |   4 +-
 test/less/import/interpolation-vars.less      |   6 +
 26 files changed, 807 insertions(+), 405 deletions(-)

diff --cc package.json
index fe21929,c2d194d..518426c
--- a/package.json
+++ b/package.json
@@@ -57,10 -57,9 +57,10 @@@
      "grunt-contrib-jshint": "~0.10.0",
      "grunt-contrib-uglify": "~0.6.0",
      "grunt-shell": "~1.1.1",
-     "matchdep": "~0.3.0",
-     "time-grunt": "~1.0.0",
      "grunt-browserify": "~3.1.0",
+     "matchdep": "~0.3.0",
+     "time-grunt": "~1.0.0"
 +    "grunt-saucelabs": "~8.3.2"
    },
    "keywords": [
      "compile less",

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