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

projects / framework / uifw / evas.git / commit

author	Daniel Juyung Seo <juyung.seo@samsung.com>
	Mon, 7 Jun 2010 09:56:08 +0000 (18:56 +0900)
committer	Daniel Juyung Seo <juyung.seo@samsung.com>
	Mon, 7 Jun 2010 09:56:08 +0000 (18:56 +0900)
commit	ffcb54235cdd7598204f72799556f576243aed02
tree	8cb4344d5c70a663ac436319ef6be0892c0910e4	tree \| snapshot
parent	a9c6e428f617e4a9f9f2beb3854936e8b12aecf5	commit \| diff
parent	8b0be9748ef7e4e4d7bdaa8605818a14f686f667	commit \| diff

Merge with EFL svn repo

Merge branch 'svn_merge'

Conflicts:
configure.ac
m4/evas_check_loader.m4
src/lib/engines/common/evas_image_load.c
src/modules/loaders/Makefile.am
src/modules/loaders/bmp/Makefile.am
src/modules/loaders/bmp/evas_image_load_bmp.c

Domain: UI Framework / Uncategorized;

RSS Atom

configure.ac	diff1 \|	diff2 \|	blob \| history
evas.spec.in	diff1 \|	diff2 \|	blob \| history
m4/evas_check_loader.m4	diff1 \|	diff2 \|	blob \| history
src/lib/canvas/evas_object_textblock.c	diff1 \|	diff2 \|	blob \| history
src/lib/engines/common/evas_image_load.c	diff1 \|	diff2 \|	blob \| history
src/lib/file/evas_module.c	diff1 \|	diff2 \|	blob \| history
src/modules/engines/gl_x11/evas_engine.c	diff1 \|	diff2 \|	blob \| history
src/modules/loaders/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/modules/loaders/bmp/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/modules/loaders/bmp/evas_image_load_bmp.c	diff1 \|	diff2 \|	blob \| history
src/modules/loaders/png/evas_image_load_png.c	diff1 \|	diff2 \|	blob \| history