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

projects / framework / uifw / elementary.git / commit

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

author	Tae-Hwan Kim <the81.kim@samsung.com>
	Fri, 9 Mar 2012 06:21:21 +0000 (15:21 +0900)
committer	Tae-Hwan Kim <the81.kim@samsung.com>
	Fri, 9 Mar 2012 06:21:21 +0000 (15:21 +0900)
commit	a5f0f44665e39bee416ec16e4cb809632e57e5c3
tree	7f178ebee106917588fb9074839af95141d46cb8	tree \| snapshot
parent	275ec067443afc9d88a19c659aa7af396701371f	commit \| diff

Fix conflicts: Map, Hover, Hoversel, Menu, Web

Change-Id: I5c6d681cfaf2b5430a56aa15ffb8fe67f70e113e

23 files changed:

data/themes/widgets/map.edc		diff \| blob \| history
src/bin/test_hover.c		diff \| blob \| history
src/bin/test_hoversel.c		diff \| blob \| history
src/bin/test_map.c		diff \| blob \| history
src/bin/test_menu.c		diff \| blob \| history
src/bin/test_web.c		diff \| blob \| history
src/edje_externals/elm_map.c		diff \| blob \| history
src/examples/map_example_01.c		diff \| blob \| history
src/examples/map_example_02.c		diff \| blob \| history
src/examples/map_example_03.c		diff \| blob \| history
src/examples/menu_example_01.c		diff \| blob \| history
src/examples/web_example.c		diff \| blob \| history
src/lib/elc_hoversel.c		diff \| blob \| history
src/lib/elc_hoversel.h		diff \| blob \| history
src/lib/elm_hover.c		diff \| blob \| history
src/lib/elm_hover.h		diff \| blob \| history
src/lib/elm_map.c		diff \| blob \| history
src/lib/elm_map.h		diff \| blob \| history
src/lib/elm_menu.c		diff \| blob \| history
src/lib/elm_menu.h		diff \| blob \| history
src/lib/elm_web.c		diff \| blob \| history
src/lib/elm_web.h		diff \| blob \| history
src/modules/test_map/mod.c		diff \| blob \| history

Domain: UI Framework / Uncategorized;