Fixed Merge Error
authorJaeHwanLee <jael.lee@samsung.com>
Fri, 28 Dec 2012 11:41:29 +0000 (20:41 +0900)
committerJaeHwanLee <jael.lee@samsung.com>
Fri, 28 Dec 2012 11:41:29 +0000 (20:41 +0900)
commite6a70c2e11b069872db76c9181d4e53d2b30d55e
tree1f2001aafb4f66ed11c3a96be39a77dd737fee6d
parent8305070df928b1b7e89f80a5f876dce5aa539be3
Fixed Merge Error

Change-Id: If981e74b66e925f6b082940049bfd5f5d35f6118
Signed-off-by: JaeHwanLee <jael.lee@samsung.com>
src/FShell_QuickPanelFrame.cpp