diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2009-10-22 19:27:34 -0700 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-10-22 19:27:34 -0700 |
commit | 21c795b64d14dbd3496903ba5aaab196de2e7a2a (patch) | |
tree | 6ab54c3279819342757dae4c3b7fd28d968dd819 /progs/xdemos/glsync.c | |
parent | ea92bef2898bc3391407702b0843ebb9d5e083fc (diff) | |
parent | 286611d99060c38c4cc12f18fde5448213e2a44b (diff) |
Merge branch 'master' into asm-shader-rework-3asm-shader-rework-3
Conflicts:
src/mesa/shader/lex.yy.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 34167d339f..da87306cf2 100644 --- a/progs/xdemos/glsync.c +++ b/progs/xdemos/glsync.c @@ -95,7 +95,7 @@ enum sync_type { static void usage(char *name) { printf("usage: %s [-w <width>] [-h <height>] [-s<sync method>] " - "[-vc]\n", name); + "[-v]\n", name); printf("\t-s<sync method>:\n"); printf("\t\tn: none\n"); printf("\t\ts: SGI video sync extension\n"); |