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

projects / framework / uifw / evas.git / commit

author	Mike McCormack <mj.mccormack@samsung.com>
	Wed, 5 Oct 2011 04:17:32 +0000 (13:17 +0900)
committer	Mike McCormack <mj.mccormack@samsung.com>
	Wed, 5 Oct 2011 04:26:39 +0000 (13:26 +0900)
commit	927c101747e2ad832d421328528406b7e2d1ba9f
tree	5ccaa92ad3a3ab072a6748f3efacb6b97b7eca68	tree \| snapshot
parent	67571cf5ef0428d7195fb516edd97a99405aee75	commit \| diff
parent	4001f74a3e75042c307a8646ae4e3932d7b195f2	commit \| diff

Merge branch 'upstream'

Conflicts:
src/lib/canvas/evas_events.c
src/lib/canvas/evas_object_main.c
src/lib/canvas/evas_object_textblock.c
src/modules/engines/gl_x11/evas_engine.c
src/modules/loaders/gif/evas_image_load_gif.c
src/modules/loaders/jpeg/evas_image_load_jpeg.c

Domain: UI Framework / Uncategorized;

RSS Atom

configure.ac	diff1 \|	diff2 \|	blob \| history
src/lib/Evas.h	diff1 \|	diff2 \|	blob \| history
src/lib/cache/evas_cache_image.c	diff1 \|	diff2 \|	blob \| history
src/lib/canvas/evas_events.c	diff1 \|	diff2 \|	blob \| history
src/lib/canvas/evas_object_main.c	diff1 \|	diff2 \|	blob \| history
src/lib/include/evas_common.h	diff1 \|	diff2 \|	blob \| history
src/modules/engines/gl_common/evas_gl_shader.c	diff1 \|	diff2 \|	blob \| history
src/modules/engines/gl_common/evas_gl_texture.c	diff1 \|	diff2 \|	blob \| history
src/modules/engines/gl_x11/evas_engine.c	diff1 \|	diff2 \|	blob \| history
src/modules/loaders/gif/evas_image_load_gif.c	diff1 \|	diff2 \|	blob \| history