X-Git-Url: http://git.sourceforge.jp/view?p=shogi-server%2Fshogi-server.git;a=blobdiff_plain;f=changelog;h=c00f7e4ff05f9d8a9db0d2414278e478bba25829;hp=f167a901869e824392f329887b034f0e5487066f;hb=62ad30f;hpb=cd9bfae56a0c922ac2c82895ad4765364b597738

diff --git a/changelog b/changelog
index f167a90..c00f7e4 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+2014-07-19  Daigo Moriwaki <daigo at debian dot org>
+
+	* [mk_rate]
+	  - Added a new option, --abnormal-threshold n:
+	    Games that end with the 'abnormal' status are counted in
+	    win/lost games for the rating calculation if a game plays more
+	    than n plies. Otherwise (or if n is zero), abnormal games are
+	    counted out of rating games.
+
 2013-12-29  Daigo Moriwaki <daigo at debian dot org>
 
 	* [shogi-server]
@@ -61,10 +70,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.
->>>>>>> 201312-usiToCsa
 
 2013-11-24  Daigo Moriwaki <daigo at debian dot org>