# HG changeset patch
# User MattD <ext-matt.4.davies@nokia.com>
# Date 1285343895 -3600
# Node ID 6356de74619b8e1a86c960c71ee327b8966d8724
# Parent  19ce5231ffe4529b2ba0b75e039c046dfc256d1f# Parent  c1509651cd2b17ee96f59033b99c5f582f053603
merged faisal's branch of EGL_MERGE on top of all of the dead heads of Jose. This makes Faisal's changes the 'tip' of EGL_MERGE again. No changes.

diff -r c1509651cd2b -r 6356de74619b egl/eglrefimpl/inc/eglinternal.h
diff -r c1509651cd2b -r 6356de74619b egl/eglrefimpl/inc/openvginternal.h
diff -r c1509651cd2b -r 6356de74619b egl/eglrefimpl/inc/riArray.h
diff -r c1509651cd2b -r 6356de74619b egl/eglrefimpl/inc/riContext.h
diff -r c1509651cd2b -r 6356de74619b egl/eglrefimpl/inc/riDefs.h
diff -r c1509651cd2b -r 6356de74619b egl/eglrefimpl/inc/riFont.h
diff -r c1509651cd2b -r 6356de74619b egl/eglrefimpl/inc/riImage.h
diff -r c1509651cd2b -r 6356de74619b egl/eglrefimpl/inc/riMath.h
diff -r c1509651cd2b -r 6356de74619b egl/eglrefimpl/inc/riMiniEGL.h
diff -r c1509651cd2b -r 6356de74619b egl/eglrefimpl/inc/riPath.h
diff -r c1509651cd2b -r 6356de74619b egl/eglrefimpl/inc/riPixelPipe.h
diff -r c1509651cd2b -r 6356de74619b egl/eglrefimpl/inc/riRasterizer.h
diff -r c1509651cd2b -r 6356de74619b egl/eglrefimpl/inc/vguinternal.h
diff -r c1509651cd2b -r 6356de74619b openvg/openvgrefimplementation/sfopenvg/bwins/sflibopenvgrefimplu.def