Merge branch 'mesa_7_6_branch'

Conflicts:

	src/mesa/drivers/windows/gdi/mesa.def

diff --cc src/mesa/drivers/windows/gdi/mesa.def
Simple merge

diff --cc src/mesa/main/get.c
index a6e004a,604b106..6c5ce02
--- 1/src/mesa/main/get.c
--- 2/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@@ -7228,12 -7216,8 +7228,12 @@@ _mesa_GetInteger64v( GLenum pname, GLin
           params[0] = IROUND64(ctx->Depth.BoundsMin);
           params[1] = IROUND64(ctx->Depth.BoundsMax);
           break;
 +      case GL_DEPTH_CLAMP:
 +         CHECK_EXT1(ARB_depth_clamp, "GetInteger64v");
 +         params[0] = BOOLEAN_TO_INT64(ctx->Transform.DepthClamp);
 +         break;
        case GL_MAX_DRAW_BUFFERS_ARB:
-          params[0] = ctx->Const.MaxDrawBuffers;
+          params[0] = (GLint64)(ctx->Const.MaxDrawBuffers);
           break;
        case GL_DRAW_BUFFER0_ARB:
           params[0] = ENUM_TO_INT64(ctx->DrawBuffer->ColorDrawBuffer[0]);

diff --cc src/mesa/main/get_gen.py
Simple merge

diff --cc src/mesa/main/histogram.c
Simple merge

diff --cc src/mesa/vbo/vbo_exec.h
Simple merge

diff --cc src/mesa/vbo/vbo_exec_api.c
Simple merge

diff --cc src/mesa/vbo/vbo_exec_draw.c
Simple merge

diff --cc windows/VC8/mesa/mesa/mesa.vcproj
Simple merge