merge upstream

This commit is contained in:
Arthur Ice
2014-12-21 13:45:26 -08:00
193 changed files with 4491 additions and 9483 deletions
-1
View File
@@ -24,7 +24,6 @@
#include "position.h"
#include <stdio.h>
#include <string>
#define BEST_Z_INVALID -99999