From: Keith Whitwell <keith@tungstengraphics.com>
Date: Mon, 22 Sep 2008 05:30:55 +0000 (-0700)
Subject: Merge branch 'master' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dace236c5fffa29d59e4d12fa865889bbecbdd24;p=mesa.git

Merge branch 'master' into gallium-0.2

Conflicts:

	src/mesa/glapi/glapi.h
	src/mesa/main/api_exec.c
	src/mesa/main/attrib.c
	src/mesa/main/clear.c
	src/mesa/main/context.c
	src/mesa/main/mfeatures.h
	src/mesa/main/mipmap.c
	src/mesa/main/mipmap.h
	src/mesa/main/readpix.c
	src/mesa/main/sources
	src/mesa/main/state.c
	src/mesa/main/texformat.c
	src/mesa/main/texparam.c
	src/mesa/main/texstate.c
	src/mesa/vbo/vbo_context.c
	src/mesa/x86/common_x86_asm.S
---

dace236c5fffa29d59e4d12fa865889bbecbdd24
diff --cc src/mesa/main/sources
index 468121bd1dc,eb8cd900ee5..6a165f1ae26
--- a/src/mesa/main/sources
+++ b/src/mesa/main/sources
@@@ -78,6 -78,7 +78,10 @@@ vsnprintf.
  MESA_MAIN_HEADERS = \
  accum.h \
  api_arrayelt.h \
++<<<<<<< HEAD:src/mesa/main/sources
++=======
+ api_eval.h \
++>>>>>>> master:src/mesa/main/sources
  api_exec.h \
  api_loopback.h \
  api_noop.h \
diff --cc src/mesa/x86/common_x86_asm.S
index 09c86b05ba8,ea4047a0e14..a681ff9b9eb
--- a/src/mesa/x86/common_x86_asm.S
+++ b/src/mesa/x86/common_x86_asm.S
@@@ -39,6 -39,7 +39,10 @@@
   * in there will break the build on some platforms.
   */
  
++<<<<<<< HEAD:src/mesa/x86/common_x86_asm.S
++=======
+ #include "matypes.h"
++>>>>>>> master:src/mesa/x86/common_x86_asm.S
  #include "assyntax.h"
  #include "common_x86_features.h"