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

projects / framework / uifw / elementary.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0746644 1e4b432)

author	Jeonghyun Yun <jh0506.yun@samsung.com>
	Thu, 5 Apr 2012 10:44:18 +0000 (19:44 +0900)
committer	Jeonghyun Yun <jh0506.yun@samsung.com>
	Thu, 5 Apr 2012 11:20:16 +0000 (20:20 +0900)
commit	7be8f0f90b2c9b5a8b11d964b9e7d87fdfbf766c
tree	19f9f905e6ed967e5b0de6ba3cbd3957d1470276	tree \| snapshot
parent	07466442c9349d9a22e8ca412ec36bf0a5ec2730	commit \| diff
parent	1e4b43267cbf0628c73cf193c98115a1460d6c07	commit \| diff

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

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

12 files changed:

elementary.pc.in	diff1 \|	diff2 \|	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_socket.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_check.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_entry.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_widget.h	diff1 \|	diff2 \|	blob \| history
src/lib/els_scroller.c	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Uncategorized;