Merge branch 'master' of git+ssh://repo.or.cz/srv/git/pachi
commitd501613ea8903415727b598c719d1f9a38910ce1
authorPetr Baudis <pasky@ucw.cz>
Wed, 21 Jul 2010 10:43:04 +0000 (21 12:43 +0200)
committerPetr Baudis <pasky@ucw.cz>
Wed, 21 Jul 2010 10:43:04 +0000 (21 12:43 +0200)
tree9b87e0581fcaa8eabbaa2ab43033ddd4c8156d05
parent70c04dacbb366f342f6e0d45f57bce395b688059
parent28f870ce978fdfd08a49b5711207d330789e8de5
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/pachi

Conflicts:
uct/plugin/wolf.c
uct/plugin/wolf.c