From: Jinkun Jang <jinkun.jang@samsung.com>
Date: Fri, 15 Mar 2013 16:18:45 +0000 (+0900)
Subject: merge with master
X-Git-Tag: submit/tizen_2.1/20130424.233441~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ecac3f0b4595242535d56b82b02150f99f9e5f4;p=platform%2Fcore%2Ftelephony%2Ftel-plugin-indicator.git

merge with master
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6869650..60dc7c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Werror -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wdeclaration-after-statement -Wmissing-declarations -Wredundant-decls -Wcast-align")
 
 ADD_DEFINITIONS("-DFEATURE_DLOG_DEBUG")
-ADD_DEFINITIONS("-DTCORE_LOG_TAG=\"TEL_PLUGIN_INDICATOR\"")
+ADD_DEFINITIONS("-DTCORE_LOG_TAG=\"INDICATOR\"")
 
 MESSAGE(${CMAKE_C_FLAGS})
 MESSAGE(${CMAKE_EXE_LINKER_FLAGS})
diff --git a/src/desc-indicator.c b/src/desc-indicator.c
old mode 100644
new mode 100755