[DRE-commits] [ruby-org] 289/303: Merge tag 'upstream/0.8.0'

[Jérémy Bobbio]

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

lunar pushed a commit to branch master
in repository ruby-org.

commit ed5d8706ab048b3d8a42489492a68af19093db4b
Merge: 5748d4a 0182860
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Fri Aug 9 18:24:45 2013 +0200

    Merge tag 'upstream/0.8.0'
    
    Revert to upstream 0.8.0 version for a more straightforward packaging
    experience.
    
    Conflicts:
    	History.txt
    	announcement.txt
    	lib/org-ruby.rb
    	lib/org-ruby/html_output_buffer.rb
    	lib/org-ruby/html_symbol_replace.rb
    	lib/org-ruby/line.rb
    	lib/org-ruby/output_buffer.rb
    	lib/org-ruby/parser.rb
    	lib/org-ruby/regexp_helper.rb
    	lib/org-ruby/textile_symbol_replace.rb
    	org-ruby.gemspec
    	spec/html_code_syntax_highlight_examples/advanced-code-no-color.html
    	spec/html_code_syntax_highlight_examples/code-no-color.html
    	spec/html_code_syntax_highlight_examples/code-pygments.html
    	spec/html_code_syntax_highlight_examples/src-code-list-no-color.html
    	spec/html_code_syntax_highlight_examples/src-code-list-pygments.html
    	spec/html_examples/block_code.html
    	spec/html_examples/code-block-lists.html
    	spec/html_examples/code-lists.html
    	spec/html_examples/emphasis.html
    	spec/html_examples/entities.html
    	spec/html_examples/properties_drawer.html
    	spec/html_examples/raw-html.html
    	spec/html_examples/raw-html.org
    	spec/parser_spec.rb
    	util/gen-special-replace.el

 .gitignore                                         |    2 +
 .travis.yml                                        |   12 +
 History.txt                                        |    4 -
 announcement.txt                                   |    3 +-
 lib/org-ruby.rb                                    |    2 +-
 lib/org-ruby/html_output_buffer.rb                 |   30 +-
 lib/org-ruby/html_symbol_replace.rb                |  686 ++++++++++----------
 lib/org-ruby/line.rb                               |    5 +-
 lib/org-ruby/output_buffer.rb                      |   10 +-
 lib/org-ruby/parser.rb                             |    6 +-
 lib/org-ruby/regexp_helper.rb                      |   18 +-
 lib/org-ruby/textile_symbol_replace.rb             |  686 ++++++++++----------
 org-ruby.gemspec                                   |    6 +-
 .../advanced-code-no-color.html                    |    8 +-
 .../code-no-color.html                             |    4 +-
 .../code-pygments.html                             |    4 +-
 .../src-code-list-no-color.html                    |    4 +-
 .../src-code-list-pygments.html                    |    3 +-
 spec/html_examples/block_code.html                 |   18 +-
 spec/html_examples/code-block-lists.html           |    8 +-
 spec/html_examples/code-lists.html                 |    2 +-
 spec/html_examples/emphasis.html                   |   40 +-
 spec/html_examples/entities.html                   |    2 +-
 spec/html_examples/properties_drawer.html          |    2 +-
 spec/html_examples/raw-html.html                   |    5 -
 spec/html_examples/raw-html.org                    |   12 -
 spec/parser_spec.rb                                |    3 +-
 util/gen-special-replace.el                        |   11 +-
 28 files changed, 785 insertions(+), 811 deletions(-)

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