Catchup Merge
authorMattD <mattd@symbian.org>
Wed, 25 Nov 2009 12:41:40 +0000
changeset 305 8a442cfb199f
parent 304 f2c605a21e42 (diff)
parent 303 9d167c70494d (current diff)
child 306 a229e5413c43
Catchup Merge
--- a/symbian3/split/sysdefs/system_model_os.xml	Tue Nov 24 15:29:39 2009 +0000
+++ b/symbian3/split/sysdefs/system_model_os.xml	Wed Nov 25 12:41:40 2009 +0000
@@ -1396,6 +1396,11 @@
   <unit bldFile="/sf/os/graphics/graphicsaccelaration/vgi/group"/>
 </component>
 </collection>
+<collection name="m3g_core_api" long-name="M3G_core_api">
+<component name="m3g_core_api" long-name="M3G Core API" origin-model="foundation">
+  <unit bldFile="sf/os/graphics/graphics_plat/m3g_core_api/group"/>
+</component>
+</collection>
 <collection name="m3g" long-name="M3G" level="internal-adaptations">
 <component name="m3gcore11" long-name="M3G Core 11" origin-model="foundation">
   <unit bldFile="/sf/os/graphics/m3g/m3gcore11/group"/>
@@ -1477,6 +1482,7 @@
 <collection name="opengles" long-name="OpenGLES" level="internal-adaptations">
 <component name="openglesinterface" long-name="OpenGL ES Interface" introduced="8.0" purpose="optional">
 <unit bldFile="os\graphics\opengles\openglesinterface\group" mrp="os\graphics\opengles\openglesinterface\group\graphics_openglesheaders.mrp"/>
+<unit bldFile="os\graphics\opengles\openglesinterface\group\opengles_stub" /> <!-- MattD 20091124 - stub implementation that we need to rename this afterwards -->
 </component>
 </collection>
 <collection name="openvg" long-name="OpenVG" level="internal-adaptations">