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 07:22:56 +0000 (16:22 +0900)
committer	Jeonghyun Yun <jh0506.yun@samsung.com>
	Thu, 8 Mar 2012 07:22:56 +0000 (16:22 +0900)
commit	739e5d5f63286138411bf3999fd2883a6fd3bc18
tree	cb27f8d4837f9679e5379626d53031b4397dfe5b	tree \| snapshot
parent	a943d11fb33f5ba946a7e047375e7579e2d9169c	commit \| diff

src/bin src/edje_external conflict fixed

39 files changed:

data/edje_externals/Makefile.am		diff \| blob \| history
data/edje_externals/ico_colorselector.png	[deleted file]	blob \| history
data/edje_externals/ico_datetime.png	[deleted file]	blob \| history
data/edje_externals/icons.edc		diff \| blob \| history
src/bin/Makefile.am		diff \| blob \| history
src/bin/config.c		diff \| blob \| history
src/bin/quicklaunch.c		diff \| blob \| history
src/bin/test.c		diff \| blob \| history
src/bin/test_anchorblock.c	[deleted file]	blob \| history
src/bin/test_anchorview.c	[deleted file]	blob \| history
src/bin/test_eio.c		diff \| blob \| history
src/bin/test_gengrid.c		diff \| blob \| history
src/bin/test_grid.c		diff \| blob \| history
src/bin/test_inwin.c		diff \| blob \| history
src/bin/test_launcher.c		diff \| blob \| history
src/bin/test_pager.c	[deleted file]	blob \| history
src/bin/test_separator.c		diff \| blob \| history
src/bin/test_weather.c		diff \| blob \| history
src/bin/test_win_inline.c		diff \| blob \| history
src/bin/test_win_plug.c		diff \| blob \| history
src/bin/test_win_socket.c		diff \| blob \| history
src/bin/test_win_state.c		diff \| blob \| history
src/edje_externals/Makefile.am		diff \| blob \| history
src/edje_externals/elm.c		diff \| blob \| history
src/edje_externals/elm_anchorblock.c	[deleted file]	blob \| history
src/edje_externals/elm_anchorview.c	[deleted file]	blob \| history
src/edje_externals/elm_colorpalette.c	[deleted file]	blob \| history
src/edje_externals/elm_colorpicker.c	[deleted file]	blob \| history
src/edje_externals/elm_datefield.c	[deleted file]	blob \| history
src/edje_externals/elm_gengrid.c		diff \| blob \| history
src/edje_externals/elm_nocontents.c	[deleted file]	blob \| history
src/edje_externals/elm_notepad.c	[deleted file]	blob \| history
src/edje_externals/elm_page_control.c	[deleted file]	blob \| history
src/edje_externals/elm_pager.c	[deleted file]	blob \| history
src/edje_externals/elm_picker.c	[deleted file]	blob \| history
src/edje_externals/elm_searchbar.c	[deleted file]	blob \| history
src/edje_externals/elm_timepicker.c	[deleted file]	blob \| history
src/edje_externals/elm_video.c		diff \| blob \| history
src/edje_externals/modules.inc		diff \| blob \| history

Domain: UI Framework / Uncategorized;

RSS Atom