Merge branch 'master' of ssh://repo.or.cz/srv/git/pachi
commit4fca6338b920f357baf1fd4d68f22b1222f77b15
authorPetr Baudis <pasky@ucw.cz>
Wed, 7 Oct 2009 22:29:23 +0000 (8 00:29 +0200)
committerPetr Baudis <pasky@ucw.cz>
Wed, 7 Oct 2009 22:29:23 +0000 (8 00:29 +0200)
tree4ae7637abef7b1bbd53736f3850aa66d35ef66dd
parentb1ae592b6aa98e08147a6c7c8b03dad788d5fb57
parent8120269a77c8d479205f4e7d16d56e24526ee506
Merge branch 'master' of ssh://repo.or.cz/srv/git/pachi

Conflicts:

tactics.c
tactics.c