EFL core migration revision 69910

author Jeonghyun Yun <jh0506.yun@samsung.com>

Thu, 5 Apr 2012 03:54:28 +0000 (12:54 +0900)

committer Jeonghyun Yun <jh0506.yun@samsung.com>

Thu, 5 Apr 2012 10:41:04 +0000 (19:41 +0900)
author Jeonghyun Yun <jh0506.yun@samsung.com>
Thu, 5 Apr 2012 03:54:28 +0000 (12:54 +0900)
committer Jeonghyun Yun <jh0506.yun@samsung.com>
Thu, 5 Apr 2012 10:41:04 +0000 (19:41 +0900)
diff --cc .gitignore

index 4fbea18,da31c37..f7cc2d4

mode 100755,100644..100755
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
diff --cc src/lib/Evas_GL.h
Simple merge
diff --cc src/lib/canvas/evas_map.c
Simple merge
author	Jeonghyun Yun <jh0506.yun@samsung.com>
	Thu, 5 Apr 2012 03:54:28 +0000 (12:54 +0900)
committer	Jeonghyun Yun <jh0506.yun@samsung.com>
	Thu, 5 Apr 2012 10:41:04 +0000 (19:41 +0900)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/Evas_GL.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/canvas/evas_map.c	patch \|	diff1 \|	diff2 \|	blob \| history