OSDN Git Service

Merge branch 'tmp-soft-only' into tmp-hw-ycc
authorKenichi Kurimoto <kurimoto12@users.sourceforge.jp>
Fri, 31 Dec 2010 07:43:44 +0000 (16:43 +0900)
committerKenichi Kurimoto <kurimoto12@users.sourceforge.jp>
Fri, 31 Dec 2010 07:43:44 +0000 (16:43 +0900)
commit6376e321bdeb521cb94afc75930cb3be1c7f7ea4
tree5e7308de50abe8e2b83f4b2fc843354cb4c8426d
parent2101cb8415cc2cc24aaabf0f8f6c8a7ea6c71ca5
parent637bdb8ccc5d45c7b52e7596b6626cc7d1e5cf2a
Merge branch 'tmp-soft-only' into tmp-hw-ycc