OSDN Git Service

(root) / shogi-server / shogi-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c363dd3 0c29075)
Merge branch 'master' into wdoor-stable 20151213
authorDaigo Moriwaki <daigo@debian.org>
Sun, 13 Dec 2015 12:28:20 +0000 (21:28 +0900)
committerDaigo Moriwaki <daigo@debian.org>
Sun, 13 Dec 2015 12:28:20 +0000 (21:28 +0900)
Conflicts:
shogi_server.rb

1  2 
changelog patch | diff1 | diff2 | blob | history

diff --cc changelog
Simple merge
shogi-server source
About OSDN
Find Software
Develop Software
Help