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

[Nobuhiro Iwamatsu]

 debianmeetingresume200706.tex                   |   17 +++++++++++++----
 debianmeetingresume200707-presentation-fsij.tex |    2 +-
 image200706/logo-banner-split1.bb               |    2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 93a5a72c3646d5668a05434d171b38b39194a6cf
Merge: eca4bcdb609475700955ebce4692d20ca60d1f38 95adb658e96e42c62f3157ad64f2fdcca9779b43
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Sat Jul 7 07:55:46 2007 +0900

    Merge branch 'master' of ssh://iwamatsu-guest@git.debian.org/git/tokyodebian/monthly-report
    
    Conflicts:
    
    	debianmeetingresume200706.tex

commit eca4bcdb609475700955ebce4692d20ca60d1f38
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Sat Jul 7 07:51:52 2007 +0900

    update debianmeetingresume200707-presentation-fsij.tex

commit 90ccf982f96798e2c7e8956c22e68dab449ed179
Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
Date:   Sat Jul 7 07:49:58 2007 +0900

    update debianmeetingresume200706.tex