diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-15 08:55:18 +0200 |
| commit | d6f64084b9bc07d0bdd527f9354f2d1d962ed16d (patch) | |
| tree | 81b2652d421992fd63143a04885e332e83e18d07 /mesalib/src/mesa/drivers/windows/gdi/mesa.def | |
| parent | 669b562a737c9418c53bfae69c0dbf1aabe318b4 (diff) | |
| parent | 7a2af605c2c2b0d2e9bbb0b161eba8842acefbcb (diff) | |
| download | vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.gz vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.tar.bz2 vcxsrv-d6f64084b9bc07d0bdd527f9354f2d1d962ed16d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
fontconfig/src/fcint.h
fontconfig/src/fcstat.c
mesalib/src/mapi/glapi/gen/GL3x.xml
xorg-server/glx/glxext.h
Diffstat (limited to 'mesalib/src/mesa/drivers/windows/gdi/mesa.def')
| -rw-r--r-- | mesalib/src/mesa/drivers/windows/gdi/mesa.def | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/mesalib/src/mesa/drivers/windows/gdi/mesa.def b/mesalib/src/mesa/drivers/windows/gdi/mesa.def index d5c98801d..fec7bbac0 100644 --- a/mesalib/src/mesa/drivers/windows/gdi/mesa.def +++ b/mesalib/src/mesa/drivers/windows/gdi/mesa.def @@ -556,21 +556,6 @@ EXPORTS glFogCoorddvEXT glFogCoordPointerEXT glBlendFuncSeparateEXT - glFlushVertexArrayRangeNV - glVertexArrayRangeNV - glCombinerParameterfvNV - glCombinerParameterfNV - glCombinerParameterivNV - glCombinerParameteriNV - glCombinerInputNV - glCombinerOutputNV - glFinalCombinerInputNV - glGetCombinerInputParameterfvNV - glGetCombinerInputParameterivNV - glGetCombinerOutputParameterfvNV - glGetCombinerOutputParameterivNV - glGetFinalCombinerInputParameterfvNV - glGetFinalCombinerInputParameterivNV glResizeBuffersMESA glWindowPos2dMESA glWindowPos2dvMESA |