From: Sung-jae Park <nicesj.park@samsung.com>
Date: Tue, 22 Oct 2013 03:48:43 +0000 (+0900)
Subject: Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/livebox/livebox... 
X-Git-Tag: accepted/tizen/20131022.083652^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa9bf4455e98aead8a4db5f99d431e8b7ab28d29;p=platform%2Fframework%2Fweb%2Flivebox-edje.git

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

aa9bf4455e98aead8a4db5f99d431e8b7ab28d29
diff --cc CMakeLists.txt
index 7120572,43a9465..a96a48f
--- a/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