Corrected a merge miss in changelog caused by the previous merge

[shogi-server/shogi-server.git] / changelog

diff --git a/changelog b/changelog
index 37d6d10..69e6b33 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,3 +1,15 @@
+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]
@@ -9,6 +21,13 @@
        * [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]
@@ -42,6 +61,8 @@
            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.
 
 2013-11-24  Daigo Moriwaki <daigo at debian dot org>