[DRE-commits] [ruby-rouge] 01/02: Merge tag 'upstream/1.6.2'

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository ruby-rouge.

commit 20057c189812b296195b6912251f59bfac143fcd
Merge: 911f13e 8e14117
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Sun Aug 17 20:43:27 2014 +0900

    Merge tag 'upstream/1.6.2'
    
    Upstream version 1.6.2

 checksums.yaml.gz               | Bin 268 -> 270 bytes
 lib/rouge/demos/slim            |  17 +++
 lib/rouge/lexers/common_lisp.rb |   2 +-
 lib/rouge/lexers/haml.rb        |  17 ++-
 lib/rouge/lexers/javascript.rb  | 109 ++++++++++++-------
 lib/rouge/lexers/objective_c.rb |   2 +-
 lib/rouge/lexers/php.rb         |   2 +-
 lib/rouge/lexers/qml.rb         |   6 +-
 lib/rouge/lexers/slim.rb        | 224 ++++++++++++++++++++++++++++++++++++++++
 lib/rouge/lexers/swift.rb       |  54 ++++++++--
 lib/rouge/regex_lexer.rb        |  11 +-
 lib/rouge/version.rb            |   2 +-
 metadata.yml                    |  12 ++-
 rouge.gemspec                   |   6 +-
 14 files changed, 401 insertions(+), 63 deletions(-)

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