Merge branch 'search' of ssh://review.tizen.org:29418/profile/common/apps/native...

Change-Id: I7e5e68e2eddce0c9bcd6cef2598e77ec5f04fe87
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>

diff --cc setting-search/CMakeLists.txt
index 3f302dafc878e4accb551308f26c84c08eef6dfe,8b0d443ab0147b2060265d0b36de1a6651acc800..504baa6815d877cdf39166f987a83de05b5bb06b
--- 1/setting-search/CMakeLists.txt
--- 2/setting-search/CMakeLists.txt
+++ b/setting-search/CMakeLists.txt
@@@ -19,7 -19,6 +19,10 @@@ pkg_check_modules(pkgs_search REQUIRE
        pkgmgr
        pkgmgr-info
        capi-appfw-package-manager
++<<<<<<< HEAD
 +      capi-ui-sticker-consumer
++=======
++>>>>>>> bfdddd21bf333ac6a454f79fd264af137c690d70
  )
  
  FOREACH(flag ${pkgs_search_CFLAGS})
@@@ -47,7 -46,7 +50,11 @@@ ADD_EXECUTABLE(${PROJECT_SETTING_SEARCH
        ./src/setting-search-util.c
        )
  
++<<<<<<< HEAD
 +TARGET_LINK_LIBRARIES(${PROJECT_SETTING_SEARCH} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON}  -lsetting-common)
++=======
+ TARGET_LINK_LIBRARIES(${PROJECT_SETTING_SEARCH} -L${CMAKE_BINARY_DIR}/${SETTING_COMMON} -lsetting-common)
++>>>>>>> bfdddd21bf333ac6a454f79fd264af137c690d70
  TARGET_LINK_LIBRARIES(${PROJECT_SETTING_SEARCH} ${pkgs_search_LDFLAGS} -pie)
  
  INSTALL(PROGRAMS ${PROJECT_SETTING_SEARCH} DESTINATION ${TZ_SYS_RO_APP}/${SETTING_PKG_NAME}/bin)

diff --cc setting-search/src/setting-search-app.c
Simple merge

diff --cc setting-search/src/setting-search-util.c
index 97c47539b644f07a8575aea54812077cf84eae18,f5da53b39933f34b29916dcec97c4e4dd9bab9ac..fba2e408763b668fc7bc772cc086590a79d035d2
--- 1/setting-search/src/setting-search-util.c
--- 2/setting-search/src/setting-search-util.c
+++ b/setting-search/src/setting-search-util.c
@@@ -580,7 -362,6 +580,10 @@@ static search_result_t **_search_db(reg
  
  search_result_t **setting_search(const char *search, int *found_size)
  {
++<<<<<<< HEAD
 +
++=======
++>>>>>>> bfdddd21bf333ac6a454f79fd264af137c690d70
        regex_t regex;
        int res;
        res = regcomp(&regex, search, REG_NOSUB);