OSDN Git Service

Merge branch 'branch_0.12.0' into b0120-git
authorAtsushi Konno <konn@users.sourceforge.jp>
Wed, 26 Nov 2008 15:37:26 +0000 (00:37 +0900)
committerAtsushi Konno <konn@users.sourceforge.jp>
Wed, 26 Nov 2008 15:37:26 +0000 (00:37 +0900)
commitf8547a02cfedcfbaa8810923472d80b913df7941
treeb94f19b2170dc52327809d1a94984364dd6d810f
parentc2167eb312778f2461eb2b9a3abe88d5e7c9cc2e
parent34043ab1179029202d3533189cd0dc423872186f
Merge branch 'branch_0.12.0' into b0120-git

Conflicts:
etc/device_data.xml