Sync with master
authorMarco Costalba <mcostalba@gmail.com>
Fri, 30 Jan 2015 16:58:18 +0000 (17:58 +0100)
committerMarco Costalba <mcostalba@gmail.com>
Fri, 30 Jan 2015 16:58:18 +0000 (17:58 +0100)
bench: 7374604

1  2 
src/search.cpp
src/search.h

diff --cc src/search.cpp
Simple merge
diff --cc src/search.h
Simple merge