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

projects / framework / uifw / ecore.git / commit

author	jaehwan <jae.hwan.kim@samsung.com>
	Fri, 10 Sep 2010 14:40:51 +0000 (23:40 +0900)
committer	jaehwan <jae.hwan.kim@samsung.com>
	Fri, 10 Sep 2010 14:40:51 +0000 (23:40 +0900)
commit	a38bdde5f4dbadbe0550ed8d50c79d562cf1fcb2
tree	74de00d61e27fe04ecf84a4ff76ff83aea5037d7	tree \| snapshot
parent	5c678adca8c0e6e7b296bff31eada00a1c2bc07d	commit \| diff
parent	35c1999f184e335956c0923e29f4d59fb45dcaeb	commit \| diff

[efl upgrade]
Merge with EFL svn repo

Merge branch 'svn_merge'

Conflicts:
src/lib/ecore/Ecore.h
src/lib/ecore_evas/Ecore_Evas.h
src/lib/ecore_evas/ecore_evas_x.c
src/lib/ecore_imf/Makefile.am
src/lib/ecore_x/Ecore_X.h
src/lib/ecore_x/Ecore_X_Atoms.h
src/lib/ecore_x/ecore_x_atoms_decl.h
src/lib/ecore_x/xcb/ecore_xcb.c
src/lib/ecore_x/xcb/ecore_xcb_events.c
src/lib/ecore_x/xcb/ecore_xcb_private.h
src/lib/ecore_x/xcb/ecore_xcb_selection.c
src/lib/ecore_x/xlib/ecore_x.c
src/lib/ecore_x/xlib/ecore_x_atoms.c
src/lib/ecore_x/xlib/ecore_x_e.c
src/lib/ecore_x/xlib/ecore_x_events.c
src/lib/ecore_x/xlib/ecore_x_private.h
src/lib/ecore_x/xlib/ecore_x_selection.c

53 files changed:

debian/_original/libecore-con-svn-01.install	blob1 \|	blob2 \|	history
debian/_original/libecore-con-svn-01.shlibs	blob1 \|	blob2 \|	history
debian/_original/libecore-config-svn-01.install	blob1 \|	blob2 \|	history
debian/_original/libecore-config-svn-01.shlibs	blob1 \|	blob2 \|	history
debian/_original/libecore-evas-svn-01.install	blob1 \|	blob2 \|	history
debian/_original/libecore-fb-svn-01.install	blob1 \|	blob2 \|	history
debian/_original/libecore-fb-svn-01.shlibs	blob1 \|	blob2 \|	history
debian/_original/libecore-file-svn-01.install	blob1 \|	blob2 \|	history
debian/_original/libecore-file-svn-01.shlibs	blob1 \|	blob2 \|	history
debian/_original/libecore-imf-svn-01.install	blob1 \|	blob2 \|	history
debian/_original/libecore-imf-svn-01.shlibs	blob1 \|	blob2 \|	history
debian/_original/libecore-input-svn-01.install	blob1 \|	blob2 \|	history
debian/_original/libecore-input-svn-01.shlibs	blob1 \|	blob2 \|	history
debian/_original/libecore-ipc-svn-01.install	blob1 \|	blob2 \|	history
debian/_original/libecore-ipc-svn-01.shlibs	blob1 \|	blob2 \|	history
debian/_original/libecore-svn-01.install	blob1 \|	blob2 \|	history
debian/_original/libecore-svn-01.shlibs	blob1 \|	blob2 \|	history
debian/_original/libecore-x-svn-01.install	blob1 \|	blob2 \|	history
debian/_original/libecore-x-svn-01.shlibs	blob1 \|	blob2 \|	history
debian/changelog	diff1 \|	\|	blob \| history
debian/control	diff1 \|	\|	blob \| history
debian/libecore-con.install	\|	\|	blob
debian/libecore-con.shlibs	\|	\|	blob
debian/libecore-config.install	\|	\|	blob
debian/libecore-config.shlibs	\|	\|	blob
debian/libecore-dev.install	diff1 \|	\|	blob \| history
debian/libecore-evas.install	\|	\|	blob
debian/libecore-evas.shlibs	diff1 \|	diff2 \|	blob \| history
debian/libecore-fb.install	\|	\|	blob
debian/libecore-fb.shlibs	\|	\|	blob
debian/libecore-file.install	\|	\|	blob
debian/libecore-file.shlibs	\|	\|	blob
debian/libecore-imf.install	\|	\|	blob
debian/libecore-imf.shlibs	\|	\|	blob
debian/libecore-input.install	diff1 \|	\|	blob \| history
debian/libecore-input.shlibs	\|	\|	blob
debian/libecore-ipc.install	\|	\|	blob
debian/libecore-ipc.shlibs	\|	\|	blob
debian/libecore-x.install	\|	\|	blob
debian/libecore-x.shlibs	\|	\|	blob
debian/libecore.install	\|	\|	blob
debian/libecore.shlibs	diff1 \|	\|	blob \| history
src/lib/ecore/ecore.c	diff1 \|	diff2 \|	blob \| history
src/lib/ecore_evas/Ecore_Evas.h	diff1 \|	diff2 \|	blob \| history
src/lib/ecore_evas/ecore_evas_x.c	diff1 \|	diff2 \|	blob \| history
src/lib/ecore_imf/Ecore_IMF.h	diff1 \|	diff2 \|	blob \| history
src/lib/ecore_imf/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/lib/ecore_imf/ecore_imf_context.c	diff1 \|	diff2 \|	blob \| history
src/lib/ecore_x/Ecore_X.h	diff1 \|	diff2 \|	blob \| history
src/lib/ecore_x/Ecore_X_Atoms.h	diff1 \|	diff2 \|	blob \| history
src/lib/ecore_x/ecore_x_atoms_decl.h	diff1 \|	diff2 \|	blob \| history
src/lib/ecore_x/xlib/ecore_x_atoms.c	diff1 \|	diff2 \|	blob \| history
src/lib/ecore_x/xlib/ecore_x_e.c	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Uncategorized;

RSS Atom