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

projects / framework / uifw / elementary.git / commit

author	Jeonghyun Yun <jh0506.yun@samsung.com>
	Thu, 8 Mar 2012 09:06:40 +0000 (18:06 +0900)
committer	Jeonghyun Yun <jh0506.yun@samsung.com>
	Thu, 8 Mar 2012 09:06:40 +0000 (18:06 +0900)
commit	38c3e0891db1d57c5fd0f1cca10b26ef58e1a433
tree	a82d1d245affced324ca7fc34ab799e4e4b66799	tree \| snapshot
parent	75cd60a8ec1b13f5b611e26bdd5b31e43b0f0f89	commit \| diff

src/lib conflict fixed

38 files changed:

doc/widgets/widget_preview_mapbuf.c		diff \| blob \| history
src/lib/Elementary.h.in		diff \| blob \| history
src/lib/Makefile.am		diff \| blob \| history
src/lib/elm_access.c		diff \| blob \| history
src/lib/elm_app.h		diff \| blob \| history
src/lib/elm_cache.h		diff \| blob \| history
src/lib/elm_debug.h		diff \| blob \| history
src/lib/elm_deprecated.h		diff \| blob \| history
src/lib/elm_deprecated_before.h	[deleted file]	blob \| history
src/lib/elm_engine.h	[deleted file]	blob \| history
src/lib/elm_finger.h		diff \| blob \| history
src/lib/elm_font.c		diff \| blob \| history
src/lib/elm_general.h		diff \| blob \| history
src/lib/elm_gengrid.c		diff \| blob \| history
src/lib/elm_gengrid.h		diff \| blob \| history
src/lib/elm_getting_started.h		diff \| blob \| history
src/lib/elm_grid.c		diff \| blob \| history
src/lib/elm_grid.h		diff \| blob \| history
src/lib/elm_intro.h		diff \| blob \| history
src/lib/elm_mapbuf.c		diff \| blob \| history
src/lib/elm_mapbuf.h		diff \| blob \| history
src/lib/elm_mirroring.h		diff \| blob \| history
src/lib/elm_need.h		diff \| blob \| history
src/lib/elm_object.h		diff \| blob \| history
src/lib/elm_object_item.h		diff \| blob \| history
src/lib/elm_plug.h		diff \| blob \| history
src/lib/elm_priv.h		diff \| blob \| history
src/lib/elm_route.c		diff \| blob \| history
src/lib/elm_route.h		diff \| blob \| history
src/lib/elm_scale.h		diff \| blob \| history
src/lib/elm_theme.c		diff \| blob \| history
src/lib/elm_theme.h		diff \| blob \| history
src/lib/elm_thumb.c		diff \| blob \| history
src/lib/elm_thumb.h		diff \| blob \| history
src/lib/elm_video.c		diff \| blob \| history
src/lib/elm_video.h		diff \| blob \| history
src/lib/elm_widget.h		diff \| blob \| history
src/modules/access_output/Makefile.am		diff \| blob \| history

Domain: UI Framework / Uncategorized;

RSS Atom