Merge branch 'master' into pool_rebirth
commit099869a9b6e211aca3330094c7b2ee0fff9f5afe
authorMaurizio Monge <maurizio@localhost.localdomain>
Thu, 12 Jul 2007 22:05:37 +0000 (13 00:05 +0200)
committerMaurizio Monge <maurizio@localhost.localdomain>
Thu, 12 Jul 2007 22:05:37 +0000 (13 00:05 +0200)
tree6aaa1207e65cf1dcbc7be963c719166795684685
parent9b72b4715825c2d35f7a595eee46cfed6d1cf8d4
parent28be922c8c8054aeb184c113299c65bb910c31b3
Merge branch 'master' into pool_rebirth

Conflicts:

src/common.h
src/board.h
src/common.h
src/piecepool.h