From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 22 Dec 2008 19:31:52 +0000 (+0000)
Subject: Merge commit 'origin/gallium-0.1' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9136c9b29ed5c14bc89a4c4e3a391e0b097092e1;p=mesa.git

Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	src/gallium/auxiliary/util/Makefile
---

9136c9b29ed5c14bc89a4c4e3a391e0b097092e1
diff --cc src/gallium/auxiliary/util/Makefile
index f611f82773a,5c227c1eb54..6773ed73cff
--- a/src/gallium/auxiliary/util/Makefile
+++ b/src/gallium/auxiliary/util/Makefile
@@@ -10,8 -11,7 +11,9 @@@ C_SOURCES = 
  	u_gen_mipmap.c \
  	u_handle_table.c \
  	u_hash_table.c \
+ 	u_hash.c \
 +	u_keymap.c \
 +	u_linear.c \
  	u_math.c \
  	u_mm.c \
  	u_rect.c \
diff --cc src/gallium/auxiliary/util/SConscript
index 8a04955a16e,1ef06631bf3..f5bd308083b
--- a/src/gallium/auxiliary/util/SConscript
+++ b/src/gallium/auxiliary/util/SConscript
@@@ -10,8 -11,8 +11,9 @@@ util = env.ConvenienceLibrary
  		'u_draw_quad.c',
  		'u_gen_mipmap.c',
  		'u_handle_table.c',
+ 		'u_hash.c',
  		'u_hash_table.c',
 +		'u_keymap.c',
  		'u_math.c',
  		'u_mm.c',
  		'u_rect.c',