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

projects / framework / uifw / edje.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 429a8e2 dd10b40)

author	jaehwan <jae.hwan.kim@samsung.com>
	Fri, 10 Sep 2010 14:44:29 +0000 (23:44 +0900)
committer	jaehwan <jae.hwan.kim@samsung.com>
	Fri, 10 Sep 2010 14:44:29 +0000 (23:44 +0900)
commit	e7e7cc1ead6a6c4a9d7a33071f6469a95fd8a2d7
tree	4021a7fe22f5545e96995085f33eb258f0771809	tree \| snapshot
parent	429a8e27d3414576d6abbb49eb3b32363daf10ec	commit \| diff
parent	dd10b404eaf7e5c7b6a65c90870087dfcb1c9703	commit \| diff

[efl upgrade]
Merge with EFL svn repo

Merge branch 'svn_merge'

Conflicts:
configure.ac
src/lib/edje_data.c
src/lib/edje_entry.c
src/lib/edje_private.h

configure.ac	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	\|	blob \| history
debian/control	diff1 \|	\|	blob \| history
debian/libedje.install	\|	\|	blob
debian/libedje.shlibs	\|	\|	blob
src/bin/edje_cc_handlers.c	diff1 \|	diff2 \|	blob \| history
src/lib/Edje.h	diff1 \|	diff2 \|	blob \| history
src/lib/edje_data.c	diff1 \|	diff2 \|	blob \| history
src/lib/edje_entry.c	diff1 \|	diff2 \|	blob \| history
src/lib/edje_private.h	diff1 \|	diff2 \|	blob \| history
src/lib/edje_util.c	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Uncategorized;