Merge branch 'master' of git+ssh://repo.or.cz/srv/git/pachi
commit7b3fdc350e0f8025675422af751a58503f27f51f
authorPetr Baudis <pasky@ucw.cz>
Sat, 1 Jan 2011 13:43:06 +0000 (1 14:43 +0100)
committerPetr Baudis <pasky@ucw.cz>
Sat, 1 Jan 2011 13:43:06 +0000 (1 14:43 +0100)
treefcc1c485fe6996cd834834d415dad9f0b42a4000
parent61b284978c7bb832000cd4a7ce03e4720df9510d
parent1b27436c39fe35cf57e9c9dd88763120bc3122ca
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/pachi

Conflicts:
uct/policy/ucb1amaf.c
gtp.c
uct/policy/ucb1amaf.c