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

projects / framework / uifw / elementary.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 722eb87 de66f25)

author	Tae-Hwan Kim <the81.kim@samsung.com>
	Mon, 23 Apr 2012 05:45:19 +0000 (14:45 +0900)
committer	Tae-Hwan Kim <the81.kim@samsung.com>
	Mon, 23 Apr 2012 05:45:40 +0000 (14:45 +0900)
commit	7db660f4d4570360151c8dfb98371c1e8b0b48cf
tree	ce918b8d578f5586ded49f39f60ccb8f5478afe6	tree \| snapshot
parent	722eb870f33e850c3479157bdfd9bcb7f5d1bff4	commit \| diff
parent	de66f251227a418479b3958117f1a857cb3f531d	commit \| diff

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

Conflicts:
src/lib/elm_genlist.c
src/lib/elm_toolbar.c

Change-Id: I1a214a018f4d093ae52015ce223955e57ff902cc

configure.ac	diff1 \|	diff2 \|	blob \| history
src/lib/elc_multibuttonentry.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_check.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_diskselector.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_genlist.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_index.c	diff1 \|	diff2 \|	blob \| history
src/lib/elm_map.c	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_win.c	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Uncategorized;