[Pkg-javascript-commits] [less.js] 33/88: Merge remote-tracking branch 'origin/master' into detached-rulesets

[Jonas Smedegaard]

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

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

commit 2be0b8c9228ba064871cb30feb3a44b58a72e12f
Merge: f7414a1 deec346
Author: Luke Page <luke.a.page at gmail.com>
Date:   Tue Feb 11 13:53:16 2014 +0000

    Merge remote-tracking branch 'origin/master' into detached-rulesets

 .travis.yml                                  |  8 ++++
 README.md                                    |  3 +-
 build/README.md                              |  3 +-
 lib/less/parser.js                           | 58 +++++++++++++++-----------
 lib/less/tree/directive.js                   | 62 +++++++++++++++-------------
 package.json                                 |  4 +-
 test/css/debug/linenumbers-all.css           |  4 +-
 test/css/debug/linenumbers-comments.css      |  2 +-
 test/css/debug/linenumbers-mediaquery.css    |  2 +-
 test/css/variables-in-at-rules.css           | 18 ++++++++
 test/less/errors/at-rules-undefined-var.less |  4 ++
 test/less/errors/at-rules-undefined-var.txt  |  4 ++
 test/less/variables-in-at-rules.less         | 20 +++++++++
 13 files changed, 132 insertions(+), 60 deletions(-)


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