From: Sungyeon Woo <s.woo@samsung.com>
Date: Tue, 14 May 2013 06:07:09 +0000 (+0900)
Subject: Merge branch 'tizen_2.1' into devgfx
X-Git-Tag: accepted/tizen/20130924.144426~1^2~327^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=421f4e5bc2631e68d9a858ed7ae4bec70159592e;p=platform%2Fframework%2Fnative%2Fuifw.git

Merge branch 'tizen_2.1' into devgfx

Change-Id: I2a5cec902ff6b89bb21ad4bd240fdf2ffe9b07f3
---

421f4e5bc2631e68d9a858ed7ae4bec70159592e
diff --cc src/graphics/FGrp_Font.cpp
index 66d93fb,3087802..e6895d5
mode 100755,100644..100755
--- a/src/graphics/FGrp_Font.cpp
+++ b/src/graphics/FGrp_Font.cpp