Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/livebox/livebox...

diff --cc CMakeLists.txt
index 7120572,43a9465..a96a48f
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -28,8 -28,9 +28,9 @@@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INS
  ADD_DEFINITIONS("-DPATH_MAX=256")
  ADD_DEFINITIONS("-DPACKAGE=\"${PROJECT_NAME}\"")
  
 -ADD_DEFINITIONS("${EXTRA_CFLAGS} -g -Wall -Werror")
 +ADD_DEFINITIONS("${EXTRA_CFLAGS} -g -Wall")
  ADD_DEFINITIONS("-DNDEBUG")
+ ADD_DEFINITIONS("-D_USE_ECORE_TIME_GET")
  ADD_DEFINITIONS("-DLOG_TAG=\"LIVEBOX_EDJE\"")
  
  ADD_LIBRARY(${PROJECT_NAME} SHARED