OSDN Git Service

Merge branch 'master' of git.sourceforge.jp:/gitroot/shogi-server/shogi-server
authorDaigo Moriwaki <daigo@debian.org>
Sat, 7 Jan 2012 03:41:42 +0000 (12:41 +0900)
committerDaigo Moriwaki <daigo@debian.org>
Sat, 7 Jan 2012 03:41:42 +0000 (12:41 +0900)
commit42fea02e19112ca25966e705ee98cd45cfc70155
tree3bd699651199691fb80af1da87a0ed06553b3635
parenta5c94012656902e73e00f46e7a4c7004b24d4578
parent2df8c798aeb7f0e77735e893fd1370c2c6f15c4d
Merge branch 'master' of git.sourceforge.jp:/gitroot/shogi-server/shogi-server

Conflicts:
changelog
changelog