diff options
author | Brian Paul <brianp@vmware.com> | 2010-01-04 19:16:24 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2010-01-04 19:16:24 -0700 |
commit | 5ac16495a2772886100789f04e1a7d65068e9a40 (patch) | |
tree | 3a387294b977841ac4255ff8fbfedd1ce2dc8946 /progs/samples/wave.c | |
parent | bfc34c880492f15dc47db30e88f888d1c48d5e70 (diff) | |
parent | 6d845808589b9df84f23551b122533a55dce6bd5 (diff) |
Merge branch 'mesa_7_7_branch'
Conflicts:
docs/relnotes.html
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/r300/r300_cs.h
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/main/enums.c
Diffstat (limited to 'progs/samples/wave.c')
-rw-r--r-- | progs/samples/wave.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/samples/wave.c b/progs/samples/wave.c index d3c4687459..396a6943e3 100644 --- a/progs/samples/wave.c +++ b/progs/samples/wave.c @@ -92,7 +92,7 @@ GLubyte contourTexture2[] = { #endif -void GLUTCALLBACK glut_post_redisplay_p(void) +static void GLUTCALLBACK glut_post_redisplay_p(void) { static double t0 = -1.; double t, dt; |