[Pkg-javascript-commits] [less.js] 14/25: Merge https://github.com/less/less.js into font-face-property-merge-2-2035

[Jonas Smedegaard]

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

js pushed a commit to annotated tag v1.7.4
in repository less.js.

commit 8daa61f22009d6b2c604b7928acc38dafaa4ca33
Merge: f565860 1b204fe
Author: jurcovicovam <meri at meri.org>
Date:   Sun Jul 27 14:02:38 2014 +0200

    Merge https://github.com/less/less.js into font-face-property-merge-2-2035
    
    Conflicts:
    	test/sourcemaps/basic.json

 lib/less/tree/anonymous.js   |  8 ++++++--
 lib/less/tree/directive.js   |  3 +++
 lib/less/tree/import.js      |  2 +-
 lib/less/tree/ruleset.js     | 20 +++++++++++++++++++-
 test/css/import-inline.css   |  5 ++++-
 test/css/import.css          |  1 +
 test/less/import-inline.less |  1 +
 test/less/import.less        |  1 +
 test/sourcemaps/basic.json   |  2 +-
 9 files changed, 37 insertions(+), 6 deletions(-)

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