[DRE-commits] [ruby-sprockets] 02/04: Merge tag 'upstream/2.10.0'

[Hleb Valoshka]

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

tsfgnu-guest pushed a commit to branch master
in repository ruby-sprockets.

commit a3f800256cb3ecf4f84eecbfab0ba158898be323
Merge: 349c6ed 14484cb
Author: Hleb Valoshka <375GNU at Gmail.COM>
Date:   Sat Oct 12 23:52:15 2013 +0300

    Merge tag 'upstream/2.10.0'
    
    Upstream version 2.10.0
    
    Conflicts:
    	README.md
    	lib/sprockets/bundled_asset.rb
    	lib/sprockets/version.rb
    	metadata.yml

 README.md                            |   68 +++++-
 bin/sprockets                        |    8 +
 checksums.yaml.gz                    |  Bin 0 -> 269 bytes
 lib/rake/sprocketstask.rb            |   37 ++-
 lib/sprockets.rb                     |   22 +-
 lib/sprockets/asset.rb               |   19 +-
 lib/sprockets/asset_attributes.rb    |   13 +-
 lib/sprockets/base.rb                |   69 +++++-
 lib/sprockets/bundled_asset.rb       |    4 +-
 lib/sprockets/closure_compressor.rb  |   22 ++
 lib/sprockets/compressing.rb         |   73 ++++++
 lib/sprockets/context.rb             |   56 ++++-
 lib/sprockets/directive_processor.rb |    4 +-
 lib/sprockets/environment.rb         |    1 +
 lib/sprockets/errors.rb              |    1 +
 lib/sprockets/index.rb               |    1 +
 lib/sprockets/jst_processor.rb       |    8 +-
 lib/sprockets/manifest.rb            |   64 ++++-
 lib/sprockets/processed_asset.rb     |    2 +-
 lib/sprockets/processing.rb          |   40 ----
 lib/sprockets/sass_cache_store.rb    |    6 +-
 lib/sprockets/sass_compressor.rb     |   27 +++
 lib/sprockets/sass_functions.rb      |   70 ++++++
 lib/sprockets/sass_importer.rb       |    4 +-
 lib/sprockets/sass_template.rb       |   13 +-
 lib/sprockets/uglifier_compressor.rb |   29 +++
 lib/sprockets/version.rb             |    2 +-
 lib/sprockets/yui_compressor.rb      |   27 +++
 metadata.yml                         |  433 ++++++++++++++++++----------------
 29 files changed, 807 insertions(+), 316 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-sprockets.git