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

[Junichi Uekawa]

 image200904/prework.tex |  115 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)

New commits:
commit 58159c967cb91ad46d047f2f5c541b395415dd77
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Apr 17 06:53:06 2009 +0900

    remove conflict mark

commit 4dd94c997f152a56f0d1fc115493e14eb8e94bfa
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Apr 17 06:52:52 2009 +0900

    apply nakao work.

commit 589a5f94222eb117ba09762ed9d507d981897b88
Merge: 77b81a6cc044890098cfe928449a5ca7977dc5b4 4e804a6153a52b9ac615857e0a7b1c8d9d83397f
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Apr 17 06:51:13 2009 +0900

    Merge branch 'work-yamada'
    
    Conflicts:
    	image200904/prework.tex

commit 77b81a6cc044890098cfe928449a5ca7977dc5b4
Author: Hiroyuki Yamamoto <yama1066 at gmail.com>
Date:   Fri Apr 17 01:07:51 2009 +0900

    Debian勉強会51事前課題(山本浩之)
    
    課題を提出します。
    
    >From 82ea0d57ab796bbd54c1b381f466bad9c250a572 Mon Sep 17 00:00:00 2001
    From: Hiroyuki Yamamoto <nanashi at debian.(none)>
    Date: Fri, 17 Apr 2009 01:04:13 +0900
    Subject: [PATCH] 	modified:   image200904/prework.tex

commit 7754e08f6e0ae2c1dfcc7596fa5da12ece9292f3
Author: Shin-ichiro OGAWA <rust.stnard at gmail.com>
Date:   Thu Apr 16 23:20:02 2009 +0900

    Debian勉強会51事前課題
    
    小川と言います．
    
    かなり遅くなってしまいましたが，
    一応送ります．
    
    よろしくお願いします．
    
    --------
    小川　伸一郎 ( Shin-ichiro OGAWA )
    http://d.hatena.ne.jp/conceal-rs/
    http://twitter.com/conceal_rs/
    http://iddy.jp/profile/rust/
    
    From f943fe101942e8e5b656977790ebe147523665a0 Mon Sep 17 00:00:00 2001
    From: Rust Stnard <rust.stnard+git at gmail.com>
    Date: Thu, 16 Apr 2009 23:03:50 +0900
    Subject: [PATCH] Add prework.tex
    
    Signed-off-by: Rust Stnard <rust.stnard+git at gmail.com>

commit 4e804a6153a52b9ac615857e0a7b1c8d9d83397f
Author: Takuma Yamada <tyamada at takumayamada.com>
Date:   Wed Apr 15 23:26:50 2009 +0900

    prework by tyamada