[DRE-commits] [ruby-kgio] 02/04: Merge tag 'upstream/2.9.3'

[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 ruby-kgio.

commit 9ff844dcaee638297f4a970de83927386bb27e6d
Merge: 7bd81d5 2228c66
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Thu Apr 9 17:17:48 2015 +0200

    Merge tag 'upstream/2.9.3'
    
    Upstream version 2.9.3
    
    Conflicts:
    	.gitignore

 .document                    |    1 -
 .gitignore                   |    2 +-
 .manifest                    |    6 +-
 .wrongdoc.yml => .olddoc.yml |    6 +-
 ChangeLog                    | 2341 ------------------------------------------
 GIT-VERSION-FILE             |    2 +-
 GIT-VERSION-GEN              |    2 +-
 GNUmakefile                  |    5 -
 HACKING                      |    4 +-
 ISSUES                       |   18 +-
 LATEST                       |   42 +-
 LICENSE                      |    9 +-
 NEWS                         |   39 +
 README                       |    9 +-
 Rakefile                     |   32 -
 TODO                         |    3 +-
 archive/.gitignore           |    3 +
 archive/slrnpull.conf        |    4 +
 ext/kgio/connect.c           |    5 +-
 ext/kgio/kgio.h              |    4 +-
 ext/kgio/poll.c              |    2 +-
 ext/kgio/tryopen.c           |    1 +
 ext/kgio/write.c             |    2 +-
 ext/kgio/writev.c            |   60 +-
 kgio.gemspec                 |   18 +-
 metadata.yml                 |   80 +-
 pkg.mk                       |   71 +-
 test/lib_read_write.rb       |    3 +-
 28 files changed, 240 insertions(+), 2534 deletions(-)

diff --cc .gitignore
index f6da900,2646313..fd94614
--- a/.gitignore
+++ b/.gitignore
@@@ -20,4 -19,4 +19,5 @@@ tag
  TAGS
  /LATEST
  /tmp
+ /NEWS.atom.xml
 +.pc

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