Merge remote branch 'remotes/origin/upstream'
authorJiyoun Park <jy0703.park@samsung.com>
Fri, 13 Apr 2012 09:06:45 +0000 (18:06 +0900)
committerJiyoun Park <jy0703.park@samsung.com>
Fri, 13 Apr 2012 09:06:45 +0000 (18:06 +0900)
commit80876605bbab9c737c0c09cf5f67e542e68a922e
tree552a9b29dd48024ec9d15f1690d01a86f2e71a4a
parent09ce59970da6ea46f1f1f180e71ec987733e445c
parentfc22c76ed543151458b5c3d4bb216d9c3c53f461
Merge remote branch 'remotes/origin/upstream'

Conflicts:
ChangeLog

Change-Id: I9b7ec14bd42b05c72d96b9c3240459dec90883ce
src/lib/Evas_GL.h
src/modules/engines/gl_common/evas_gl_context.c
src/modules/loaders/gif/evas_image_load_gif.c