[Tokyodebian-commits] Tokyo area Debian meeting resources.: Changes to 'master'

[Nobuhiro Iwamatsu]

 debianmeetingresume200705-presentation-iwamatsu.tex |   52 ++++++++++++++++----
 image200705/PX-EH16L.bb                             |    5 -
 image200705/dreamcast.bb                            |    5 +
 image200705/landisk_fake.bb                         |    5 -
 image200705/lbox.bb                                 |    5 -
 image200705/t-sh7706lan.bb                          |    5 -
 image200705/usl5p.bb                                |    5 -
 7 files changed, 49 insertions(+), 33 deletions(-)

New commits:
commit aa215a2c355038f89fbd2d7f22d87c7fdcc1871e
Merge: 01defd8a98a483dc54ec9d06b8ed88a88ff85b60 6fde15419347b3b7431daab6c98b805921de4ca2
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Sun Jun 17 22:13:49 2007 +0900

    Merge branch 'master' of ssh://iwamatsu-guest@git.debian.org/git/tokyodebian/monthly-report
    
    Conflicts:
    
    	image200705/PX-EH16L.bb
    	image200705/landisk_fake.bb
    	image200705/lbox.bb
    	image200705/t-sh7706lan.bb
    	image200705/usl5p.bb

commit 01defd8a98a483dc54ec9d06b8ed88a88ff85b60
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Sun Jun 17 22:11:32 2007 +0900

    Update debianmeetingresume200705-presentation-iwamatsu.tex