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

projects / framework / uifw / elementary.git / commit

author	ChunEon Park <chuneon.park@samsung.com>
	Fri, 13 Apr 2012 10:26:14 +0000 (19:26 +0900)
committer	ChunEon Park <chuneon.park@samsung.com>
	Fri, 13 Apr 2012 10:26:14 +0000 (19:26 +0900)
commit	2385c2b7f0ac75cc5017eb47a7f89c10f2e03394
tree	f1f90fc9645c59aa998955716d9ba195f3e73460	tree \| snapshot
parent	78d19fb1be62d868c1171f21c6a7f82f8cc4bf2a	commit \| diff

Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
src/lib/elm_cnp.c
src/lib/elm_entry.c
src/lib/elm_gen_common.h
src/lib/elm_genlist.c

26 files changed:

data/themes/default-desktop.edc		diff \| blob \| history
data/themes/widgets/entry.edc		diff \| blob \| history
data/themes/widgets/scroller.edc		diff \| blob \| history
src/bin/test.c		diff \| blob \| history
src/bin/test_entry.c		diff \| blob \| history
src/lib/Elementary.h.in		diff \| blob \| history
src/lib/elc_player.c		diff \| blob \| history
src/lib/elm_calendar.c		diff \| blob \| history
src/lib/elm_diskselector.c		diff \| blob \| history
src/lib/elm_entry.h		diff \| blob \| history
src/lib/elm_general.h		diff \| blob \| history
src/lib/elm_gengrid.c		diff \| blob \| history
src/lib/elm_hover.h		diff \| blob \| history
src/lib/elm_list.c		diff \| blob \| history
src/lib/elm_main.c		diff \| blob \| history
src/lib/elm_map.c		diff \| blob \| history
src/lib/elm_photocam.c		diff \| blob \| history
src/lib/elm_scroller.c		diff \| blob \| history
src/lib/elm_slider.c		diff \| blob \| history
src/lib/elm_slideshow.c		diff \| blob \| history
src/lib/elm_spinner.c		diff \| blob \| history
src/lib/elm_table.h		diff \| blob \| history
src/lib/elm_video.c		diff \| blob \| history
src/lib/elm_widget.c		diff \| blob \| history
src/lib/elm_widget.h		diff \| blob \| history
src/lib/elm_win.c		diff \| blob \| history

Domain: UI Framework / Uncategorized;

RSS Atom