[DRE-commits] [ruby-ncurses] 04/11: Merge tag 'upstream/1.4.3+dfsg'

[Per Andersson]

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

avtobiff-guest pushed a commit to branch master
in repository ruby-ncurses.

commit fb67e4230042cfa4bc5d64bd0da804f170b2920b
Merge: 78de6f8 0c273bc
Author: Per Andersson <avtobiff at gmail.com>
Date:   Wed Jan 22 02:53:38 2014 +0100

    Merge tag 'upstream/1.4.3+dfsg'
    
    Upstream version 1.4.3+dfsg
    
    Conflicts:
    	THANKS
    	VERSION
    	examples/form.rb
    	examples/form2.rb
    	extconf.rb
    	form_wrap.c
    	form_wrap.h
    	lib/ncursesw.rb
    	make_dist.rb
    	ncurses_wrap.c
    	ncurses_wrap.h

 THANKS               |   3 +-
 VERSION              |   1 -
 compat.h             |   8 ++
 examples/form.rb     |  82 ----------------
 examples/form2.rb    | 184 ----------------------------------
 extconf.rb           |  70 +++++++++++--
 form_wrap.c          | 150 ++++++++++++++++------------
 form_wrap.h          |   7 +-
 lib/ncurses_sugar.rb |  31 +++---
 lib/ncursesw.rb      |   1 +
 make_dist.rb         |  38 -------
 menu_wrap.c          |   7 +-
 ncurses_wrap.c       | 272 +++++++++++++++++++++++++++++++++++----------------
 ncurses_wrap.h       |   3 +
 ncursesw.gemspec     |  50 ++++++++++
 panel_wrap.c         |   1 +
 panel_wrap.h         |   0
 17 files changed, 426 insertions(+), 482 deletions(-)

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