upstream merge
authorJiyoun Park <jy0703.park@samsung.com>
Fri, 29 Jun 2012 05:25:26 +0000 (14:25 +0900)
committerJiyoun Park <jy0703.park@samsung.com>
Fri, 29 Jun 2012 05:25:26 +0000 (14:25 +0900)
commitafbce5cf5a761aa944a816915ccbd26a8d86b4c3
tree4857c913380bad2965b7a47b9552d0e45964f6ba
parent7010b890b3295e226c62605d48a8e696cd13638b
parent20792cb37fc7f5942cd6b8cf1ce77d09da878d4d
upstream merge
Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
src/lib/canvas/evas_gl.c
src/modules/engines/gl_x11/evas_engine.c

Change-Id: Ifd24607a8142e088f367b79f4a28ec6e1ca7114b
.gitignore
packaging/evas.spec
src/modules/engines/gl_x11/evas_x_main.c
src/modules/engines/software_generic/evas_engine.c