From: Brian Paul <brianp@vmware.com>
Date: Tue, 22 Dec 2009 01:23:53 +0000 (-0700)
Subject: Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b57abd3bea29e95e5dee2524c3f1be4b26017c0f;p=mesa.git

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
	configure.ac
	progs/demos/morph3d.c
	progs/demos/textures.c
	progs/glsl/shtest.c
	progs/glsl/texaaline.c
	progs/tests/packedpixels.c
	progs/xdemos/corender.c
	src/mesa/main/version.h
---

b57abd3bea29e95e5dee2524c3f1be4b26017c0f
diff --cc progs/tests/packedpixels.c
index c8884bb79f1,1a9c2fedf01..1e70a31151a
--- a/progs/tests/packedpixels.c
+++ b/progs/tests/packedpixels.c
@@@ -273,7 -253,7 +273,8 @@@ Draw(void
     glTranslatef(2, (i + 1) * (h + 2), 0);
     glRasterPos2i(8, 6);
     sprintf(s, "Internal Texture Format [f/F]: %s (%d of %lu)",
 +           IntFormats[CurFormat].name, CurFormat + 1, NUM_INT_FORMATS);
+            IntFormats[CurFormat].name, CurFormat + 1, (unsigned long) NUM_INT_FORMATS);
     PrintString(s);
     glPopMatrix();