fix conflicted files - toolbar, scroller
authorJaehwan Kim <jae.hwan.kim@samsung.com>
Thu, 8 Mar 2012 05:51:34 +0000 (14:51 +0900)
committerJaehwan Kim <jae.hwan.kim@samsung.com>
Thu, 8 Mar 2012 05:51:34 +0000 (14:51 +0900)
commit514f640bc84f5f81a904ec4c41b454a4306de8af
treefcf3eca066e97016e2f07817b7e567626bdb2c56
parenta86da053be7067ee8c4d13af66bbcfc6b3e89504
fix conflicted files - toolbar, scroller
data/themes/widgets/toolbar.edc
src/bin/test_scroller.c
src/bin/test_toolbar.c
src/edje_externals/elm_toolbar.c
src/lib/elm_scroll.h
src/lib/elm_scroller.c
src/lib/elm_scroller.h
src/lib/elm_toolbar.c
src/lib/elm_toolbar.h
src/lib/els_scroller.c