Merge branch 'devgfx' into tizen_2.1
authorSungyeon Woo <s.woo@samsung.com>
Thu, 23 May 2013 01:49:23 +0000 (10:49 +0900)
committerSungyeon Woo <s.woo@samsung.com>
Thu, 23 May 2013 01:54:51 +0000 (10:54 +0900)
commit808ed03318ae137d95dace0a0d62aea4d7109b7c
tree0c899d38d4f5034597e7363ba2b303e1f83feb77
parent7f8c8f35cf3c69f68deba5179612ffb41de20c66
parentc75105bf47890827e8a70be98bd3ac108d4f87a3
Merge branch 'devgfx' into tizen_2.1

Conflicts:
src/graphics/text/FGrp_TextTextSimple.cpp

Change-Id: I86637bf69284507aaf2ae9e0ea248616dc60f2e7
src/graphics/FGrp_Canvas.cpp
src/graphics/text/FGrp_TextTextSimple.cpp
src/ui/controls/FUiCtrl_EditPresenter.cpp