actionslider test application merging conflicts are resolved.
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Tue, 12 Jul 2011 03:22:56 +0000 (12:22 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Tue, 12 Jul 2011 03:22:56 +0000 (12:22 +0900)
commit3ee9dc59d5796a46ad826654b027e6876f6e0d07
tree5aa7a573e0d9285d47eabb8ec2f4a1836ee6b49b
parent13b5647306b3e9f5703590129eebaaf4531ef840
actionslider test application merging conflicts are resolved.
data/themes/default.edc
src/bin/Makefile.am
src/bin/test.c
src/bin/test_actionslider.c
src/lib/elm_actionslider.c