aboutsummaryrefslogtreecommitdiff
path: root/mesalib/include/GLES2/gl2.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-08-31 11:39:10 +0200
committermarha <marha@users.sourceforge.net>2011-08-31 11:39:10 +0200
commitbdc38022df44bde91e7ff95f6446cf20e19eaa5f (patch)
tree63386f21679537a891a7cc44fb7dc15ad57cf1df /mesalib/include/GLES2/gl2.h
parenta15173d276fcc8bb45637bba9f027136f4915652 (diff)
parentd14fe6598b87092374b1be6eb655153d270c3066 (diff)
downloadvcxsrv-bdc38022df44bde91e7ff95f6446cf20e19eaa5f.tar.gz
vcxsrv-bdc38022df44bde91e7ff95f6446cf20e19eaa5f.tar.bz2
vcxsrv-bdc38022df44bde91e7ff95f6446cf20e19eaa5f.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/docs/README.WIN32 mesalib/docs/install.html mesalib/src/glu/sgi/include/gluos.h mesalib/src/mesa/drivers/windows/gdi/wgl.c mesalib/src/mesa/main/state.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/tnl/t_draw.c
Diffstat (limited to 'mesalib/include/GLES2/gl2.h')
0 files changed, 0 insertions, 0 deletions