[Pkg-javascript-commits] [less.js] 06/285: Merge branch 'master' of https://github.com/cgross/less.js 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 d4fe4ed6cfe89a9ea194b406a17e81fc9d0b03a1
Merge: 7b0ce1e 335955f
Author: Luke Page <luke.a.page at gmail.com>
Date:   Thu Feb 13 22:33:47 2014 +0000

    Merge branch 'master' of https://github.com/cgross/less.js into 2_0_0
    
    Conflicts:
    	bower.json

 Gruntfile.js                |   16 +-
 bower.json                  |    2 +-
 dist/less-1.1.0.js          | 2695 -----------------
 dist/less-1.1.0.min.js      |   16 -
 dist/less-1.1.1.js          | 2710 -----------------
 dist/less-1.1.1.min.js      |   16 -
 dist/less-1.1.2.js          | 2712 -----------------
 dist/less-1.1.2.min.js      |   16 -
 dist/less-1.1.3.js          | 2721 -----------------
 dist/less-1.1.3.min.js      |   16 -
 dist/less-1.1.4.js          | 2769 -----------------
 dist/less-1.1.4.min.js      |   16 -
 dist/less-1.1.5.js          | 2805 -----------------
 dist/less-1.1.5.min.js      |    9 -
 dist/less-1.1.6.js          | 3004 -------------------
 dist/less-1.1.6.min.js      |    9 -
 dist/less-1.2.0.js          | 3293 --------------------
 dist/less-1.2.0.min.js      |    9 -
 dist/less-1.2.1.js          | 3318 ---------------------
 dist/less-1.2.1.min.js      |    9 -
 dist/less-1.2.2.js          | 3337 ---------------------
 dist/less-1.2.2.min.js      |    9 -
 dist/less-1.3.0.js          | 3478 ----------------------
 dist/less-1.3.0.min.js      |    9 -
 dist/less-1.3.1.js          | 4011 -------------------------
 dist/less-1.3.1.min.js      |    9 -
 dist/less-1.3.2.js          | 4401 ---------------------------
 dist/less-1.3.2.min.js      |    9 -
 dist/less-1.3.3.js          | 4413 ---------------------------
 dist/less-1.3.3.min.js      |    9 -
 dist/less-1.4.0-beta.js     | 5830 ------------------------------------
 dist/less-1.4.0-beta.min.js |   11 -
 dist/less-1.4.0.js          | 5830 ------------------------------------
 dist/less-1.4.0.min.js      |   11 -
 dist/less-1.4.1.js          | 5837 ------------------------------------
 dist/less-1.4.1.min.js      |   11 -
 dist/less-1.4.2.js          | 5837 ------------------------------------
 dist/less-1.4.2.min.js      |   11 -
 dist/less-1.5.0.js          | 6914 ------------------------------------------
 dist/less-1.5.0.min.js      |   13 -
 dist/less-1.5.1.js          | 6941 -------------------------------------------
 dist/less-1.5.1.min.js      |   13 -
 dist/less-rhino-1.1.3.js    | 2460 ---------------
 dist/less-rhino-1.1.5.js    | 2481 ----------------
 dist/less-rhino-1.3.1.js    | 3725 -----------------------
 dist/less-rhino-1.3.2.js    | 3990 -------------------------
 dist/less-rhino-1.3.3.js    | 4002 -------------------------
 dist/less-rhino-1.4.0.js    | 4273 --------------------------
 package.json                |    7 +-
 49 files changed, 17 insertions(+), 104026 deletions(-)

diff --cc Gruntfile.js
index f931cad,a27a842..b70ed36
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@@ -68,17 -67,8 +69,17 @@@ module.exports = function(grunt) 
            footer: '' // override task-level footer
          },
          src: ['<%= build.rhino %>'],
-         dest: 'dist/less-rhino-<%= pkg.version %>.js'
+         dest: 'dist/less-rhino.js'
        },
 +      // lessc for Rhino
 +      rhinolessc: {
 +        options: {
 +          banner: '/* LESS.js v<%= pkg.version %> RHINO | <%= meta.copyright %>, <%= pkg.author.name %> <<%= pkg.author.email %>> */\n\n',
 +          footer: '' // override task-level footer
 +        },
 +        src: ['<%= build.rhinolessc %>'],
 +        dest: 'dist/lessc-rhino-<%= pkg.version %>.js'
 +      },
        // Generate readme
        readme: {
          // override task-level banner and footer
@@@ -238,15 -228,10 +239,16 @@@
    // Release
    grunt.registerTask('stable', [
      'concat:stable',
-     'uglify:stable'
+     'uglify:stable',
+     'updateBowerJson'
    ]);
  
 +  // Release Rhino Version
 +  grunt.registerTask('rhino', [
 +    'concat:rhino',
 +    'concat:rhinolessc'
 +  ]);
 +  
    // Run all browser tests
    grunt.registerTask('browsertest', [
      'browser',

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