[index]Fixed Conflicts
authorGoun Lee <gouni.lee@samsung.com>
Thu, 8 Mar 2012 10:40:38 +0000 (19:40 +0900)
committerGoun Lee <gouni.lee@samsung.com>
Thu, 8 Mar 2012 10:40:38 +0000 (19:40 +0900)
commitb796ff515eb43db602daa11201f85130a375233e
treeaccbb8aa2d6aa241907b920451fa37671f2f2ca0
parent1e9c7ab31fd7d7df81411e727223ae9490aa48ad
[index]Fixed Conflicts
data/themes/widgets/label.edc
src/bin/test_label.c
src/lib/elm_label.c
src/lib/elm_label.h