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

[Nobuhiro Iwamatsu]

 debianmeetingresume200705-presentation-iwamatsu.tex |   99 ++++++++++----------
 image200705/lbox.bb                                 |    5 -
 image200705/usl5p.bb                                |    5 -
 3 files changed, 54 insertions(+), 55 deletions(-)

New commits:
commit 719770e9c89a74320511a693dfac9dec687f887b
Merge: 8c1da40fdb1ea7cc31d2aeee9d118d5325c0a993 c49fecc674db7a37efec4ecbd3f1846cdaee482c
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Mon Jun 18 17:30:05 2007 +0900

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

commit 8c1da40fdb1ea7cc31d2aeee9d118d5325c0a993
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Mon Jun 18 17:21:16 2007 +0900

    add image200705/usl5p.bb

commit 1263a6488bcb5f908e9d1fea6567c224e0c62720
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Mon Jun 18 17:19:57 2007 +0900

    debianmeetingresume200705-presentation-iwamatsu.tex update