Merge "evas: Support bitmap embedded color font." into tizen

author Jaeun Choi <jaeun12.choi@samsung.com>

Thu, 17 Sep 2015 05:23:28 +0000 (22:23 -0700)

committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>

Thu, 17 Sep 2015 05:23:28 +0000 (22:23 -0700)
author Jaeun Choi <jaeun12.choi@samsung.com>
Thu, 17 Sep 2015 05:23:28 +0000 (22:23 -0700)
committer Gerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 17 Sep 2015 05:23:28 +0000 (22:23 -0700)
diff --cc src/modules/evas/engines/gl_common/evas_gl_common.h
Simple merge
diff --cc src/modules/evas/engines/gl_generic/evas_engine.c

index 2b6c24a,e7fd8bc..3be84e7

mode 100755,100644..100755
--- 1/src/modules/evas/engines/gl_generic/evas_engine.c
--- 2/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
diff --cc src/modules/evas/engines/software_generic/evas_engine.c
Simple merge
author	Jaeun Choi <jaeun12.choi@samsung.com>
	Thu, 17 Sep 2015 05:23:28 +0000 (22:23 -0700)
committer	Gerrit Code Review <gerrit@review.vlan103.tizen.org>
	Thu, 17 Sep 2015 05:23:28 +0000 (22:23 -0700)
		1	2
src/modules/evas/engines/gl_common/evas_gl_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/modules/evas/engines/gl_generic/evas_engine.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/modules/evas/engines/software_generic/evas_engine.c	patch \|	diff1 \|	diff2 \|	blob \| history