diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2009-12-15 12:38:01 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-12-15 12:38:01 -0800 |
| commit | 11522b74b318db9d099466ff226124c23595e8e2 (patch) | |
| tree | 2f57b1d594a9f6c223b002f1c549ea5f799b37cc /progs/xdemos | |
| parent | b90f7f3ad324b1e4c39e334cdeb9556c3eb808ab (diff) | |
| parent | f23d01e726a57cd6b8e31f1049ee5853773df7ea (diff) | |
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
src/gallium/drivers/softpipe/sp_quad_blend.c
Diffstat (limited to 'progs/xdemos')
| -rw-r--r-- | progs/xdemos/glxinfo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/progs/xdemos/glxinfo.c b/progs/xdemos/glxinfo.c index 23df82f6f9..30cd568064 100644 --- a/progs/xdemos/glxinfo.c +++ b/progs/xdemos/glxinfo.c @@ -116,7 +116,7 @@ print_extension_list(const char *ext) return; width = indent; - printf(indentString); + printf("%s", indentString); i = j = 0; while (1) { if (ext[j] == ' ' || ext[j] == 0) { @@ -126,7 +126,7 @@ print_extension_list(const char *ext) /* start a new line */ printf("\n"); width = indent; - printf(indentString); + printf("%s", indentString); } /* print the extension name between ext[i] and ext[j] */ while (i < j) { |