OSDN Git Service

Merge branch '201303-yamashita_matching' into wdoor-stable
authorDaigo Moriwaki <beatles@users.sourceforge.jp>
Mon, 4 Nov 2013 06:05:57 +0000 (15:05 +0900)
committerDaigo Moriwaki <beatles@users.sourceforge.jp>
Mon, 4 Nov 2013 06:05:57 +0000 (15:05 +0900)
commit48967e86b1a0ca5ed7c67b882757b9acd2a58655
tree662637cfaec232f3b708d8ea36b7320df111b104
parent7a9b8f6315c13501a9936d89e66d93499c9e610b
parentf1ee2bbc2a4bdbc15079f0d0de9200a2cf6681a5
Merge branch '201303-yamashita_matching' into wdoor-stable

Conflicts:
changelog
changelog