Merge branch '201312-usiToCsa'

Conflicts:
	changelog

diff --cc changelog
index f55c27c,c498f62..f167a90
--- 1/changelog
--- 2/changelog
+++ b/changelog
@@@ -1,59 -1,15 +1,70 @@@
 +2013-12-29  Daigo Moriwaki <daigo at debian dot org>
 +
 +      * [shogi-server]
 +        - Previously, parameters in Floodgate time configuration file were
 +          not applied to actual instances. This issue has been fixed.
 +
 +2013-12-21  Daigo Moriwaki <daigo at debian dot org>
 +
 +      * [shogi-server]
 +        - shogi_server/pairing.rb: Impose penalty on matches between
 +          likely kin players.
 +
 +2013-12-15  Daigo Moriwaki <daigo at debian dot org>
 +
 +      * [webserver]
 +        - Listen on only IPv4 explicitly. Under ruby 1.9.3p194, without
 +          any bind addresses, ruby attempts to listen on both "0.0.0.0"
 +          and "::". Specifying "::" on Linux leads to listen on both IPv4
 +          and IPv6, which results in a warning message saying "Address
 +          already in use - bind(2)".
 +      * [shogi-server]
 +        - Released: Revision "20131215"
 +
+ 2013-12-14  Daigo Moriwaki <daigo at debian dot org>
+ 
+       * [usiToCsa]
+         - Added a new program, bin/usiToCsa.rb, which is a bridge for a
+           USI engine to connect to the Shogi-server.
+         - bin/usiToCsa is a sample wrapper script.
+ 
  2013-12-13  Daigo Moriwaki <daigo at debian dot org>
  
        * [shogi-server]
 +        - shogi_server/league/floodgate_thread.rb:
 +          - Added a log message.
 +
 +2013-12-08  Daigo Moriwaki <daigo at debian dot org>
 +
 +      * [shogi-server]
 +        - shogi-server/shogi_server/pairing.rb:
 +          - Modified comment for LeastDiff match.
 +          - Changed log messages and levels. 
 +
 +2013-12-07  Daigo Moriwaki <daigo at debian dot org>
 +
 +      * [shogi-server]
 +        - shogi_server/pairing.rb, player.rb:
 +          Simplify estimated rate of unrated players (less memory).
 +        - Enhanced syntax of Floodgate time configuration file.
 +          Now it supports "set sacrifice <player_id>"; it sets a
 +          sacrificed player for a specific Floodgate game.
 +          ex. set sacrifice gps500+e293220e3f8a3e59f79f6b0efffaa931
 +
 +2013-12-05  Daigo Moriwaki <daigo at debian dot org>
 +
 +      * [shogi-server]
 +        - Added a new pairing method, ShogiServer::ExcludeUnratedPlayers,
 +          which filters out unrated players.
 +        - Enhanced syntax of Floodgate time configuration file.
 +          Now it supports "set pairing_factory <function_name>"; it sets a
 +          factory function name generating a pairing method which will be
 +          used in a specific Floodgate game.
 +          ex. set pairing_factory floodgate_zyunisen 
++=======
+         - Implemented conversion of move representation between CSA format
+           and USI one.
++>>>>>>> 201312-usiToCsa
  
  2013-11-24  Daigo Moriwaki <daigo at debian dot org>