diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-06-12 12:09:34 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-06-12 12:09:34 -0400 |
| commit | 1036ef2bf468611d37b5df06fc4424f2002e3837 (patch) | |
| tree | f0859a6d903c2570a0a00c918da88139f8f7d065 /progs/samples/blendeq.c | |
| parent | 917f8bc1a85e61311cef6478127b387df70fba14 (diff) | |
| parent | 1cd0afffc9edbcac690f8ab436aecfced26b0aba (diff) | |
Merge master and fix conflicts
Diffstat (limited to 'progs/samples/blendeq.c')
| -rw-r--r-- | progs/samples/blendeq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/samples/blendeq.c b/progs/samples/blendeq.c index cd0474c5ce..037d06fa52 100644 --- a/progs/samples/blendeq.c +++ b/progs/samples/blendeq.c @@ -100,7 +100,7 @@ static void PrintColorStrings( void ) { GLubyte ubbuf[3]; int i, xleft, xright; - char colorString[18]; + char colorString[100]; xleft = 5 + windW/4; xright = 5 + windW/2; |