evas3d: forget evas_3d.h. it's merged to evas.h

Conflicts:

	src/lib/evas/Evas_3D.h

diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c
index fddca28..d472af6 100644 (file)
--- a/src/examples/evas/evas-3d-cube.c
+++ b/src/examples/evas/evas-3d-cube.c
@@ -2,7 +2,7 @@
 #include <Ecore_Evas.h>
 #include <stdio.h>
 #include <math.h>
-#include <Evas_3D.h>
+#include <Evas.h>
 
 #define  WIDTH          1024
 #define  HEIGHT         1024

diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index fe4d6a8..01528f6 100644 (file)
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -2,7 +2,7 @@
 #include <Ecore_Evas.h>
 #include <stdio.h>
 #include <math.h>
-#include <Evas_3D.h>
+#include <Evas.h>
 
 #define  WIDTH          1024
 #define  HEIGHT         1024

diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index 091e4eb..503bdf0 100644 (file)
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -2,7 +2,7 @@
 #include <Ecore_Evas.h>
 #include <stdio.h>
 #include <math.h>
-#include <Evas_3D.h>
+#include <Evas.h>
 
 #define  WIDTH          1024
 #define  HEIGHT         1024

diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index 02d11d5..5f4e568 100644 (file)
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -2,7 +2,7 @@
 #include <Ecore_Evas.h>
 #include <stdio.h>
 #include <math.h>
-#include <Evas_3D.h>
+#include <Evas.h>
 
 #define  WIDTH          1024
 #define  HEIGHT         1024

diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c
index 66c483e..95d9e10 100644 (file)
--- a/src/examples/evas/evas-3d-proxy.c
+++ b/src/examples/evas/evas-3d-proxy.c
@@ -2,7 +2,7 @@
 #include <Ecore_Evas.h>
 #include <stdio.h>
 #include <math.h>
-#include <Evas_3D.h>
+#include <Evas.h>
 
 #define  WIDTH          1024
 #define  HEIGHT         1024

diff --git a/src/lib/evas/Evas_3D.h b/src/lib/evas/Evas_3D.h
deleted file mode 100644 (file)
index f3ed09f..0000000
--- a/src/lib/evas/Evas_3D.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef _EVAS_3D_H
-#define _EVAS_3D_H
-#endif /* _EVAS_3D_H */