[svn merge] applied svn update from changeset 51648 to 51677
authorMyungjae Lee <mjae.lee@samsung.com>
Wed, 6 Oct 2010 13:19:04 +0000 (22:19 +0900)
committerMyungjae Lee <mjae.lee@samsung.com>
Wed, 6 Oct 2010 13:19:04 +0000 (22:19 +0900)
commit26efe177ddc405c2a94ef363e98d71868bdc3a06
tree1e16c6177b07cad47dc60485d16fdf52a1d5e1fb
parentb2cfa0df1af9570b48ac5868ef74fbf7173fa8aa
[svn merge] applied svn update from changeset 51648 to 51677
src/lib/cache/evas_cache_image.c
src/lib/canvas/evas_object_textblock.c
src/lib/engines/common/evas_font_query.c
src/lib/include/evas_common.h
src/modules/engines/gl_common/evas_gl_common.h
src/modules/engines/gl_common/evas_gl_context.c
src/modules/engines/gl_common/evas_gl_image.c
src/modules/engines/gl_common/evas_gl_texture.c
src/modules/engines/gl_x11/evas_engine.c