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

[Junichi Uekawa]

 image200906/prework.tex |  215 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 215 insertions(+)

New commits:
commit 8aa279a2f33dca0916cbc7647b5981209c3a1f9f
Merge: 581aa2cc07fb4e31c000e22deb693525ed019819 6ed34ac772ae4d72221281e41530749369e4e222
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Jun 19 23:05:56 2009 +0900

    Merge branch 'tmp-yoshino' into integration2
    
    Conflicts:
    	image200906/prework.tex

commit 581aa2cc07fb4e31c000e22deb693525ed019819
Merge: f64754426fc48137c5d0617005d0879ca91423bd 6dddd848ffbbd8ab70f4f608d7d8601be199a512
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Jun 19 23:02:45 2009 +0900

    Merge branch 'tmp-yamamoto' into integration2
    
    Conflicts:
    	image200906/prework.tex

commit f64754426fc48137c5d0617005d0879ca91423bd
Merge: e9faed703e170f055b8aef8087136f839570402b a95afdae9c084f7e0ab0e09529badfeeb0bcb086
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Jun 19 23:02:09 2009 +0900

    Merge branch 'tmp-takahasi' into integration2
    
    Conflicts:
    	image200906/prework.tex

commit e9faed703e170f055b8aef8087136f839570402b
Merge: 6c1ce915cc731721bf37f1c6c18bf61b394d7058 cf6e304d8905757fd523a471aef4e504f1cb237a
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Jun 19 23:01:24 2009 +0900

    Merge branch 'tmp-nakao' into integration2
    
    Conflicts:
    	image200906/prework.tex

commit 6c1ce915cc731721bf37f1c6c18bf61b394d7058
Merge: 09e054c1ddea6cd861a5e06040db4d52d59418da c38e2316e2eff423d5a0439be154bcf7b62bb17b
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Jun 19 23:00:25 2009 +0900

    Merge branch 'tmp-kitahara' into integration2
    
    Conflicts:
    	image200906/prework.tex

commit 09e054c1ddea6cd861a5e06040db4d52d59418da
Merge: cbfa43e3418fa5f9cb99d7e52ea0ac03bed90f70 dd153756d481359891db8e4fc1e36a7b73747c7e
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Jun 19 23:00:01 2009 +0900

    Merge branch 'tmp-hibino' into integration2
    
    Conflicts:
    	image200906/prework.tex

commit cbfa43e3418fa5f9cb99d7e52ea0ac03bed90f70
Merge: c700d1f2ea059b63bb0f25adb31e6595c5f010ea a0712c800822570346e21d3b29fd29826c392f1e
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Jun 19 22:59:32 2009 +0900

    Merge branch 'tmp-ar' into integration2
    
    Conflicts:
    	image200906/prework.tex

commit dd153756d481359891db8e4fc1e36a7b73747c7e
Author: HIBINO Kei <ex8k.hibino at gmail.com>
Date:   Fri Jun 19 11:48:14 2009 +0900

    Debian勉強会53事前課題
    
    日比野です。
    事前課題の提出です。
    
    --------------
    >From 23174bfdc2223f6fcfb85d0e06cbfc8573482410 Mon Sep 17 00:00:00 2001
    From: HIBINO Kei <hibi at loquat.hibi.localnet>
    Date: Fri, 19 Jun 2009 11:43:14 +0900
    Subject: [PATCH] Add prework.

commit cf6e304d8905757fd523a471aef4e504f1cb237a
Author: NAKAO Keisuke <chome at argv.org>
Date:   Fri Jun 19 06:36:39 2009 +0900

    add homework of nakao

commit c38e2316e2eff423d5a0439be154bcf7b62bb17b
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Jun 19 22:55:14 2009 +0900

    add kitahara patch

commit 6dddd848ffbbd8ab70f4f608d7d8601be199a512
Author: Hiroyuki Yamamoto <nanashi at debian.(none)>
Date:   Fri Jun 19 04:01:57 2009 +0900

    modified: image200906/prework.tex

commit a95afdae9c084f7e0ab0e09529badfeeb0bcb086
Author: emasaka <emasaka at gmail.com>
Date:   Fri Jun 19 00:38:39 2009 +0900

    2009-06 prework

commit c700d1f2ea059b63bb0f25adb31e6595c5f010ea
Author: Tadao Akedo <akedon at gmail.com>
Date:   Thu Jun 18 23:30:41 2009 +0900

    add akedo prework 200906

commit 6ed34ac772ae4d72221281e41530749369e4e222
Author: YOSHINO Yoshihito <yy.y.ja.jp at gmail.com>
Date:   Thu Jun 18 22:25:26 2009 +0900

    Add assignment by Yoshino

commit a0712c800822570346e21d3b29fd29826c392f1e
Author: Junichi Uekawa <dancer at netfort.gr.jp>
Date:   Fri Jun 19 22:51:50 2009 +0900

    add araki