Upstream merge
authorJiyoun Park <jy0703.park@samsung.com>
Wed, 20 Jun 2012 08:09:32 +0000 (17:09 +0900)
committerJiyoun Park <jy0703.park@samsung.com>
Wed, 20 Jun 2012 08:09:32 +0000 (17:09 +0900)
commit5a646b8e67f0c6dcd11e29ff4508a2f4b0cca99f
tree7726a2fbd54474decec3e74440387d189baeb7a2
parenta5d94559a445fe49e6541cc55944307749d3239d
parent21a0c30712931772da87fde8fd113b3a14d0101c
Upstream merge

Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
.gitignore
ChangeLog
src/lib/Evas_GL.h
src/lib/canvas/evas_map.c
src/lib/canvas/evas_object_smart.c
src/lib/canvas/evas_render.c
src/modules/engines/gl_common/evas_gl_common.h
src/modules/engines/gl_x11/evas_engine.c

Change-Id: I4faf10271aa3266949dbdb9c8fcdfda5b329f492
.gitignore
packaging/evas.spec
src/lib/cache/evas_cache_image.c
src/lib/canvas/evas_map.c
src/lib/canvas/evas_object_image.c
src/lib/canvas/evas_render.c
src/lib/engines/common/evas_font_ot.c
src/lib/engines/common/evas_image_main.c
src/lib/engines/common/evas_scale_sample.c
src/modules/engines/gl_x11/evas_engine.c
src/modules/engines/software_generic/evas_engine.c