Merge branch '2.1' into develop

2017-05-17 13:48:31 +03:00
parent 3b8bda289e 4050cd20d8
commit 322983a5f4
36 changed files with 645 additions and 245 deletions
--- a/query_classifier/test/classify.c
+++ b/query_classifier/test/classify.c
@ -11,7 +11,6 @@
 * Public License.
 */

-#include <my_config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>