From 21be2d26f08ca5938cfa254ca098c9fb5beecda5 Mon Sep 17 00:00:00 2001 From: Yuri Gorshenin Date: Mon, 28 Dec 2015 16:19:47 +0300 Subject: [PATCH] Rebase fixes. --- search/v2/geocoder.cpp | 3 ++- tools/kothic | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/search/v2/geocoder.cpp b/search/v2/geocoder.cpp index b40ccfb8e0..71afe91385 100644 --- a/search/v2/geocoder.cpp +++ b/search/v2/geocoder.cpp @@ -9,13 +9,14 @@ #include "indexer/feature_decl.hpp" #include "indexer/feature_impl.hpp" #include "indexer/index.hpp" -#include "indexer/mercator.hpp" #include "indexer/mwm_set.hpp" #include "coding/multilang_utf8_string.hpp" #include "platform/preferred_languages.hpp" +#include "geometry/mercator.hpp" + #include "base/assert.hpp" #include "base/logging.hpp" #include "base/macros.hpp" diff --git a/tools/kothic b/tools/kothic index e00d57aa05..c3f780597e 160000 --- a/tools/kothic +++ b/tools/kothic @@ -1 +1 @@ -Subproject commit e00d57aa052e1b395138e096e1b808cba3164f0c +Subproject commit c3f780597e38cefbd000f3bb1cdfb1af7ad16b17