diff options
author | Brian Paul <brianp@vmware.com> | 2009-07-28 08:58:25 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-07-28 08:58:25 -0600 |
commit | d2f6d6ce49699d35d6b6a234fe17a27d99f4b267 (patch) | |
tree | 22fcb97333ad7b6c57eb539c512a1dcc3d15a3aa /src/mesa/drivers/windows | |
parent | 94726bc69e5f9dbefb34a38695f2f51d81ff433f (diff) | |
parent | bc60b884110b9e41ee3082075717587cc38380b5 (diff) |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
configs/default
docs/relnotes.html
src/mesa/main/version.h
Diffstat (limited to 'src/mesa/drivers/windows')
-rw-r--r-- | src/mesa/drivers/windows/gdi/mesa.def | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/drivers/windows/gdi/mesa.def b/src/mesa/drivers/windows/gdi/mesa.def index ede43ef4c0..bd3e5b2137 100644 --- a/src/mesa/drivers/windows/gdi/mesa.def +++ b/src/mesa/drivers/windows/gdi/mesa.def @@ -902,7 +902,6 @@ EXPORTS _mesa_generate_mipmap _mesa_get_compressed_teximage _mesa_get_current_context - _mesa_get_program_register _mesa_get_teximage _mesa_init_driver_functions _mesa_init_glsl_driver_functions |