[DRE-commits] [coderay] 01/04: Merge tag 'upstream/1.1.1'

[zeha at debian.org]

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

zeha pushed a commit to branch master
in repository coderay.

commit b38ebfc54a26d2e74044bf170365e158620f0410
Merge: ccc440a 79517b8
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Tue Mar 1 22:50:32 2016 +0100

    Merge tag 'upstream/1.1.1'
    
    Upstream version 1.1.1

 bin/coderay                                       |   2 +-
 checksums.yaml.gz                                 | Bin 270 -> 0 bytes
 lib/coderay.rb                                    |  18 +-
 lib/coderay/encoders.rb                           |  18 ++
 lib/coderay/{ => encoders}/encoder.rb             |  11 --
 lib/coderay/encoders/html.rb                      |   5 +-
 lib/coderay/helpers/plugin.rb                     | 219 ----------------------
 lib/coderay/helpers/{plugin.rb => plugin_host.rb} |  53 ------
 lib/coderay/scanners.rb                           |  27 +++
 lib/coderay/scanners/diff.rb                      |   2 +-
 lib/coderay/scanners/java.rb                      |   2 +-
 lib/coderay/scanners/ruby.rb                      |  19 +-
 lib/coderay/scanners/ruby/patterns.rb             |   2 +-
 lib/coderay/scanners/ruby/string_state.rb         |   8 +
 lib/coderay/{ => scanners}/scanner.rb             |  18 --
 lib/coderay/scanners/sql.rb                       |  42 ++---
 lib/coderay/styles.rb                             |  15 ++
 lib/coderay/styles/alpha.rb                       |   3 +-
 lib/coderay/{ => styles}/style.rb                 |   7 +-
 lib/coderay/version.rb                            |   2 +-
 metadata.yml                                      |  28 +--
 21 files changed, 134 insertions(+), 367 deletions(-)

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