Merge branch 'master' into maurizio_review
commit590b47537759b3e2b735f6fc8cfbea70e6d00f8c
authorMaurizio Monge <maurizio@localhost.localdomain>
Thu, 12 Jul 2007 15:53:30 +0000 (12 17:53 +0200)
committerMaurizio Monge <maurizio@localhost.localdomain>
Thu, 12 Jul 2007 15:53:30 +0000 (12 17:53 +0200)
tree7db2eb37a09dcbbb33e5b5bde6fc7958a032086d
parent737e5a2b4d8613356c88637f5473c978caef6e82
parent19d480022cef589794f8fb4cece4161d215c5685
Merge branch 'master' into maurizio_review

Conflicts:

src/movelist_widget.h
src/board.h
src/loader/theme.cpp
src/movelist_p.h
src/movelist_widget.h
src/piecegroup.h
src/piecepool.h