From: daigo <beatles@users.sourceforge.jp>
Date: Sat, 24 Jul 2010 03:54:36 +0000 (+0900)
Subject: Resolved merge conflict
X-Git-Tag: 20170902~111
X-Git-Url: http://git.sourceforge.jp/view?p=shogi-server%2Fshogi-server.git;a=commitdiff_plain;h=2da79bca4e0c25714cc4e7b74fa17f859c83183a;hp=--cc

Resolved merge conflict
---

2da79bca4e0c25714cc4e7b74fa17f859c83183a
diff --cc changelog
index 8fa11c1,afa2137..6bc7d5e
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,10 +1,17 @@@
 +2010-07-23  Daigo Moriwaki <daigo at debian dot org>
 +
 +	* [shogi-server]
 +	  - shogi_server/league/floodgate_thread.rb: When the server run
 +	    with DEBUG mode, it ended up with an undefined variable error. 
 +	    This issue has been fixed.
 +
+ 2010-07-17  Daigo Moriwaki <daigo at debian dot org>
+ 
+ 	* [shogi-server]
+ 	  - shogi_server.rb, shogi_server/board.rb, shogi_server/move.rb
+ 	    - Refactoring: Board can now move_to() and move_back() a move
+ 	      instread of deep_copy().
+ 
  2010-07-11  Daigo Moriwaki <daigo at debian dot org>
  
  	* [shogi-server]