diff options
| author | Chia-I Wu <olvaffe@gmail.com> | 2010-01-12 11:25:02 +0800 |
|---|---|---|
| committer | Chia-I Wu <olvaffe@gmail.com> | 2010-01-12 11:25:02 +0800 |
| commit | 562c127693200822f04a145db50add1be2425d7b (patch) | |
| tree | 9441774fb212b17ddf2a364f06abc43f166cc00b /progs/trivial/tri-tex.c | |
| parent | e5d351dcfde58777162552cf5cd2a9cd8299f4cd (diff) | |
| parent | 077d6dd7508af88509dd0499c5dfbdaa186b4015 (diff) | |
Merge branch 'master' into opengl-es-v2
Conflicts:
src/mesa/main/dd.h
Diffstat (limited to 'progs/trivial/tri-tex.c')
| -rw-r--r-- | progs/trivial/tri-tex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/trivial/tri-tex.c b/progs/trivial/tri-tex.c index 56afb4748d..244e154504 100644 --- a/progs/trivial/tri-tex.c +++ b/progs/trivial/tri-tex.c @@ -94,7 +94,7 @@ static void Key(unsigned char key, int x, int y) case 27: exit(1); default: - return; + break; } glutPostRedisplay(); |