refresh 20cd2e56a4184214541594bb1053d485b320c35bcomponent-api/dgate.log
commite9c93ee4cb2883b5d6313c7afd5da31bbf243283
authorYann Dirson <ydirson@altern.org>
Mon, 7 Apr 2008 14:02:51 +0000 (7 16:02 +0200)
committerYann Dirson <ydirson@altern.org>
Mon, 7 Apr 2008 14:02:51 +0000 (7 16:02 +0200)
treed60e0d5a9793b70bc0cb1dca2af0dca5d32ef40b
parentfc0fc6e0c5cae260d7eacce9f103778ef7096167
refresh 20cd2e56a4184214541594bb1053d485b320c35b

conflict resolution
src/variants/minishogi/state.cpp [deleted file]
src/variants/shogi/behaviour.cpp [deleted file]