diff options
author | Brian Paul <[email protected]> | 2010-01-08 08:21:12 -0700 |
---|---|---|
committer | Brian Paul <[email protected]> | 2010-01-08 08:21:12 -0700 |
commit | fd70841121475d7aad98812d6bf9c9c67567b89a (patch) | |
tree | 13f7eef837abc0151dc663a2b6fed04d7f2cc578 /progs/xdemos/glsync.c | |
parent | a1de400e8de06a80ab140bb0fa950e990607572d (diff) | |
parent | 674c76310fe93dd3d7a15af0f72bb9f04351d09f (diff) |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/drivers/dri/i965/brw_wm_emit.c
Diffstat (limited to 'progs/xdemos/glsync.c')
-rw-r--r-- | progs/xdemos/glsync.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/xdemos/glsync.c b/progs/xdemos/glsync.c index da87306cf2a..9d4b0f1ce20 100644 --- a/progs/xdemos/glsync.c +++ b/progs/xdemos/glsync.c @@ -89,7 +89,7 @@ static char optstr[] = "w:h:s:v"; enum sync_type { none = 0, sgi_video_sync, - buffer_swap, + buffer_swap }; static void usage(char *name) |