OSDN Git Service

Merge remote-tracking branch 'origin/wdoor-stable'
authorDaigo Moriwaki <daigo@debian.org>
Fri, 22 Nov 2013 12:47:59 +0000 (21:47 +0900)
committerDaigo Moriwaki <daigo@debian.org>
Fri, 22 Nov 2013 12:47:59 +0000 (21:47 +0900)
Conflicts:
changelog

12 files changed:
1  2 
changelog
mk_game_results
mk_rate
shogi-server
shogi_server.rb
shogi_server/board.rb
shogi_server/command.rb
shogi_server/game.rb
shogi_server/pairing.rb
test/TC_ALL.rb
test/TC_command.rb
test/TC_floodgate.rb

diff --cc changelog
Simple merge
diff --cc mk_game_results
Simple merge
diff --cc mk_rate
Simple merge
diff --cc shogi-server
Simple merge
diff --cc shogi_server.rb
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc test/TC_ALL.rb
Simple merge
Simple merge
Simple merge