Merge branch 'pull-req/win32' of https://github.com/sthalik/pachi
commit32e02d4e7ab30ee9a39d7052be16de04fcc5257a
authorPetr Baudis <pasky@ucw.cz>
Tue, 29 Mar 2016 20:18:35 +0000 (29 22:18 +0200)
committerPetr Baudis <pasky@ucw.cz>
Tue, 29 Mar 2016 20:18:35 +0000 (29 22:18 +0200)
tree4d01e4a1697109e1bd7ec2de787f7064ad43d2a7
parentdf35edfad228450fc21f8c9bdfd2a89b33f20d4f
parent769d8e335276b58afc60758e76e318639516e6cf
Merge branch 'pull-req/win32' of https://github.com/sthalik/pachi

Conflicts:
tactics/nakade.c
chat.c
distributed/protocol.c
network.c