refresh ded80ada673478789e2cf32be211118c33bb1dbf
commit19b264aa465dcc5787da462cfaa46c75f7b9652a
authorYann Dirson <ydirson@altern.org>
Thu, 10 Jan 2008 22:18:12 +0000 (10 23:18 +0100)
committerYann Dirson <ydirson@altern.org>
Thu, 10 Jan 2008 22:18:12 +0000 (10 23:18 +0100)
tree2029498fb4f78abfa8024d1c1d1e540e3a33c24e
parent877c7e9bcd22c3bd2bfc203eb3e1826805ea5f58
refresh ded80ada673478789e2cf32be211118c33bb1dbf

resolve conflict
src/variants/shogi/behaviour.cpp
src/variants/shogi/state.cpp