review.tizen.org Git - framework/uifw/elementary.git/commit

projects / framework / uifw / elementary.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: dc51613) | patch

author	sumanth <sumanth.m@samsung.com>
	Fri, 9 Mar 2012 05:57:50 +0000 (11:27 +0530)
committer	sumanth <sumanth.m@samsung.com>
	Fri, 9 Mar 2012 05:57:50 +0000 (11:27 +0530)
commit	9bf9dba9bee06a000d0474b9a4a18f8717cfeab2
tree	d45f78877a5b2780a0ce6a30932e3e8073dabcb1	tree \| snapshot
parent	dc51613aaddf690cb50f00eaa19b38874c6790ef	commit \| diff

[svn merge <sumanth>] actionslider,calendar,clock,conformant,slider widgets related merge conflicts are fixed.

19 files changed:

src/bin/test_actionslider.c		diff \| blob \| history
src/bin/test_calendar.c		diff \| blob \| history
src/bin/test_clock.c		diff \| blob \| history
src/bin/test_conform.c		diff \| blob \| history
src/edje_externals/elm_calendar.c		diff \| blob \| history
src/examples/calendar_example_05.c		diff \| blob \| history
src/examples/clock_example.c		diff \| blob \| history
src/examples/slider_example.c		diff \| blob \| history
src/lib/elm_actionslider.c		diff \| blob \| history
src/lib/elm_actionslider.h		diff \| blob \| history
src/lib/elm_calendar.c		diff \| blob \| history
src/lib/elm_calendar.h		diff \| blob \| history
src/lib/elm_clock.c		diff \| blob \| history
src/lib/elm_clock.h		diff \| blob \| history
src/lib/elm_conform.c		diff \| blob \| history
src/lib/elm_conform.h		diff \| blob \| history
src/lib/elm_deprecated.h		diff \| blob \| history
src/lib/elm_slider.c		diff \| blob \| history
src/lib/elm_slider.h		diff \| blob \| history

Domain: UI Framework / Uncategorized;