[DRE-commits] [SCM] ruby-sdl.git branch, master, updated. debian/2.1.1.1-2-6-g7481c89

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 19d6b1782c44d020725555ae44fe8c78c0edb869
Merge: 2504e3e57d2426e09ffa3948593c0c3a8c85e547 8029b4433f82e9f19f74b2ae6b37bfbebd25a7e6
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Mon Apr 16 20:11:25 2012 +0900

    Merge tag 'upstream/2.1.2'
    
    Upstream version 2.1.2
    
    Conflicts:
    	NEWS.en
    	NEWS.ja
    	README.en
    	README.ja
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/ruby-sdl.docs
    	debian/ruby-sdl.examples
    	debian/rules
    	debian/source/format
    	doc-en/mixer.rsd
    	doc-en/video.rsd
    	doc/mixer.rsd
    	doc/video.rsd
    	lib/sdl.rb
    	rubysdl.h
    	rubysdl_main.c
    	rubysdl_mouse.c
    	rubysdl_ref.en.html
    	rubysdl_ref.en.rd
    	rubysdl_ref.html
    	rubysdl_ref.rd
    	rubysdl_sdlskk.c
    	rubysdl_sge_video.c
    	rubysdl_smpeg.c
    	rubysdl_ttf.c
    	sample/randrect.rb
    	sample/sgetest.rb
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>


-- 
ruby-sdl.git