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

projects / framework / uifw / elementary.git / commit

author	Jeonghyun Yun <jh0506.yun@samsung.com>
	Mon, 2 Apr 2012 09:58:40 +0000 (18:58 +0900)
committer	Jeonghyun Yun <jh0506.yun@samsung.com>
	Mon, 2 Apr 2012 10:00:58 +0000 (19:00 +0900)
commit	fca49789103ddc50469aa42a9e2b57d58bd5653c
tree	f61d6cfcfac8df410e7a2db3ad58143fa0575633	tree \| snapshot
parent	86943516997b2457c7640a7c909ee8bb6aa8090d	commit \| diff
parent	3ae075f26df6fdc3575bd70a039f780656a73d5f	commit \| diff

Elementary migration revision 69832
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
src/bin/test_genlist.c
src/examples/anchorblock_example_01.c
src/lib/elc_ctxpopup.c
src/lib/elc_multibuttonentry.c
src/lib/elm_entry.c
src/lib/elm_genlist.c
src/lib/elm_genlist.h
src/lib/elm_map.c
src/lib/elm_panes.c
src/lib/elm_spinner.c
src/lib/elm_toolbar.c
src/lib/els_scroller.c

36 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
config/default/base.src	diff1 \|	diff2 \|	blob \| history
config/illume/base.src	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
data/edje_externals/Makefile.am	diff1 \|	diff2 \|	blob \| history
data/edje_externals/icons.edc	diff1 \|	diff2 \|	blob \| history
debian/libelm.postinst	diff1 \|	\|	blob \| history
src/bin/test_dayselector.c	diff1 \|	diff2 \|	blob \| history
src/bin/test_genlist.c	diff1 \|	diff2 \|	blob \| history
src/bin/test_label.c	diff1 \|	diff2 \|	blob \| history
src/bin/test_tooltip.c	diff1 \|	diff2 \|	blob \| history
src/bin/test_win_plug.c	diff1 \|	diff2 \|	blob \| history
src/bin/test_win_socket.c	diff1 \|	diff2 \|	blob \| history
src/lib/elc_multibuttonentry.c	diff1 \|	diff2 \|	blob \| history
src/lib/elc_popup.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_cnp.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_config.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_config.h	diff1 \|	diff2 \|	blob \| history
src/lib/elm_datetime.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_diskselector.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_entry.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_entry.h	diff1 \|	diff2 \|	blob \| history
src/lib/elm_genlist.h	diff1 \|	diff2 \|	blob \| history
src/lib/elm_index.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_index.h	diff1 \|	diff2 \|	blob \| history
src/lib/elm_map.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_panes.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_plug.h	diff1 \|	diff2 \|	blob \| history
src/lib/elm_removed.h	diff1 \|	diff2 \|	blob \| history
src/lib/elm_slider.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_spinner.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_toolbar.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_widget.h	diff1 \|	diff2 \|	blob \| history
src/lib/elm_win.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_win.h	diff1 \|	diff2 \|	blob \| history
src/lib/els_scroller.c	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Uncategorized;

RSS Atom

.gitignore	diff1 \|	diff2 \|	blob \| history
config/default/base.src	diff1 \|	diff2 \|	blob \| history
config/illume/base.src	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
data/edje_externals/Makefile.am	diff1 \|	diff2 \|	blob \| history
data/edje_externals/icons.edc	diff1 \|	diff2 \|	blob \| history
debian/libelm.postinst	diff1 \|	\|	blob \| history
src/bin/test_dayselector.c	diff1 \|	diff2 \|	blob \| history
src/bin/test_genlist.c	diff1 \|	diff2 \|	blob \| history
src/bin/test_label.c	diff1 \|	diff2 \|	blob \| history
src/bin/test_tooltip.c	diff1 \|	diff2 \|	blob \| history
src/bin/test_win_plug.c	diff1 \|	diff2 \|	blob \| history
src/bin/test_win_socket.c	diff1 \|	diff2 \|	blob \| history
src/lib/elc_multibuttonentry.c	diff1 \|	diff2 \|	blob \| history
src/lib/elc_popup.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_cnp.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_config.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_config.h	diff1 \|	diff2 \|	blob \| history
src/lib/elm_datetime.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_diskselector.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_entry.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_entry.h	diff1 \|	diff2 \|	blob \| history
src/lib/elm_genlist.h	diff1 \|	diff2 \|	blob \| history
src/lib/elm_index.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_index.h	diff1 \|	diff2 \|	blob \| history
src/lib/elm_map.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_panes.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_plug.h	diff1 \|	diff2 \|	blob \| history
src/lib/elm_removed.h	diff1 \|	diff2 \|	blob \| history
src/lib/elm_slider.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_spinner.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_toolbar.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_widget.h	diff1 \|	diff2 \|	blob \| history
src/lib/elm_win.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_win.h	diff1 \|	diff2 \|	blob \| history
src/lib/els_scroller.c	diff1 \|	diff2 \|	blob \| history