[DRE-commits] [ruby-rmagick] 01/02: Merge tag 'upstream/2.13.2'

[Gunnar Wolf]

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

gwolf pushed a commit to branch master
in repository ruby-rmagick.

commit 593036ce2d9353e36029e99b039c80d25145179f
Merge: 31a74b9 61b613d
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Mon Sep 30 17:31:37 2013 -0500

    Merge tag 'upstream/2.13.2'
    
    Upstream version 2.13.2
    
    Conflicts:
    	metadata.yml

 ChangeLog              |    4 +
 README.html            |    4 +-
 build_tarball.rake     |    2 +-
 doc/comtasks.html      |    4 +-
 doc/constants.html     |    4 +-
 doc/draw.html          |    4 +-
 doc/ilist.html         |    4 +-
 doc/image1.html        |    4 +-
 doc/image2.html        |    4 +-
 doc/image3.html        |    4 +-
 doc/imageattrs.html    |    4 +-
 doc/imusage.html       |    4 +-
 doc/index.html         |    6 +-
 doc/info.html          |    4 +-
 doc/magick.html        |    4 +-
 doc/optequiv.html      |    4 +-
 doc/rvg.html           |    4 +-
 doc/rvgclip.html       |    4 +-
 doc/rvggroup.html      |    4 +-
 doc/rvgimage.html      |    4 +-
 doc/rvgpattern.html    |    4 +-
 doc/rvgshape.html      |    4 +-
 doc/rvgstyle.html      |    4 +-
 doc/rvgtext.html       |    4 +-
 doc/rvgtspan.html      |    4 +-
 doc/rvgtut.html        |    4 +-
 doc/rvguse.html        |    4 +-
 doc/rvgxform.html      |    4 +-
 doc/struct.html        |    4 +-
 doc/usage.html         |    4 +-
 ext/RMagick/MANIFEST   |  612 ++++++++++++++++++++++++------------------------
 ext/RMagick/extconf.rb |    8 +-
 ext/RMagick/rmimage.c  |    6 +-
 metadata.yml           |  404 ++++++++++++++++++++++++++++++++
 rmagick.gemspec        |    2 +-
 setup.rb               |    2 +-
 uninstall.rb           |   16 +-
 37 files changed, 793 insertions(+), 377 deletions(-)

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