From: Brian Paul <brianp@vmware.com>
Date: Wed, 13 May 2009 16:33:21 +0000 (-0600)
Subject: Merge branch 'mesa_7_5_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3039acfc5db67f3935f9c30a9f17193ab52b20a9;p=mesa.git

Merge branch 'mesa_7_5_branch'

Conflicts:

	src/mesa/main/arrayobj.c
	src/mesa/main/arrayobj.h
	src/mesa/main/context.c
---

3039acfc5db67f3935f9c30a9f17193ab52b20a9
diff --cc src/mesa/main/arrayobj.h
index 9c2f340cfae,9c4036af5a7..90c2aea1555
--- a/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@@ -56,7 -56,14 +56,8 @@@ extern voi
  _mesa_initialize_array_object( GLcontext *ctx,
                                 struct gl_array_object *obj, GLuint name );
  
 -extern void
 -_mesa_save_array_object( GLcontext *ctx, struct gl_array_object *obj );
 -
 -extern void
 -_mesa_remove_array_object( GLcontext *ctx, struct gl_array_object *obj );
 -
  
+ 
  /*
   * API functions
   */