Merge branch 'master' of ssh://repo.or.cz/srv/git/pachi
commit0052a0facf1f433904cbedbcaa7c32f699acd915
authorPetr Baudis <pasky@ucw.cz>
Sun, 4 Apr 2010 12:44:01 +0000 (4 14:44 +0200)
committerPetr Baudis <pasky@ucw.cz>
Sun, 4 Apr 2010 12:44:01 +0000 (4 14:44 +0200)
tree917412bd144ac0985a543b9cedc18a9537b3fe7d
parentc6e9d4fbe8a4f57acd1c7d9f5158d4ca94e07576
parentf6c5f45b2d04402df0f29f5b2010585e9ee8fa87
Merge branch 'master' of ssh://repo.or.cz/srv/git/pachi

Conflicts:
uct/uct.c
uct/uct.c