Merge branch 'master'
commit30f627769a406d1268cbfd71492c5cf5adc8f5c1
authorPetr Baudis <pasky@ucw.cz>
Wed, 14 Nov 2007 02:32:41 +0000 (14 03:32 +0100)
committerPetr Baudis <pasky@machine.or.cz>
Wed, 14 Nov 2007 02:32:41 +0000 (14 03:32 +0100)
tree2d0d0194f765c4327cbfb836d23f4ee46d3a1c60
parentcd47ca3fd8c989e6632cbc88b6e60ae5d09836d1
parent1814f2c04e72c0b1c960484511736de68798cc44
Merge branch 'master'

Conflicts:

board.c
board.h
board.c
board.h