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

projects / framework / uifw / elementary.git / commit

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

author	Jeonghyun Yun <jh0506.yun@samsung.com>
	Thu, 8 Mar 2012 11:38:36 +0000 (20:38 +0900)
committer	Jeonghyun Yun <jh0506.yun@samsung.com>
	Thu, 8 Mar 2012 11:38:36 +0000 (20:38 +0900)
commit	2b52dc9c5898e904f3670826535a01c7b4cee589
tree	fbabd87770218473f016a4e6ff889354caf4c3d9	tree \| snapshot
parent	debd206006f4b7c757a86327234818905774214e	commit \| diff

src/lib conflict fixed

12 files changed:

configure.ac		diff \| blob \| history
src/lib/Elementary.h.in		diff \| blob \| history
src/lib/Makefile.am		diff \| blob \| history
src/lib/elc_fileselector_entry.c		diff \| blob \| history
src/lib/elm_config.c		diff \| blob \| history
src/lib/elm_config.h		diff \| blob \| history
src/lib/elm_main.c		diff \| blob \| history
src/lib/elm_password.h	[deleted file]	blob \| history
src/lib/elm_widget.c		diff \| blob \| history
src/lib/elm_win.c		diff \| blob \| history
src/lib/elm_win.h		diff \| blob \| history
src/modules/Makefile.am		diff \| blob \| history

Domain: UI Framework / Uncategorized;