diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-11 20:11:11 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-11 20:11:11 +0100 |
| commit | fd0ee68305609b23ee135c2c547dd883014ef6fb (patch) | |
| tree | 7e426dc13c4ec2783d5b393b5d248a918b3be02e /progs/trivial | |
| parent | b66ee9e32fa044b39588df67c00858bbab64f13d (diff) | |
trivial: remove stray merge conflict
Diffstat (limited to 'progs/trivial')
| -rw-r--r-- | progs/trivial/tri.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/progs/trivial/tri.c b/progs/trivial/tri.c index c75acb3a5a..aa45adb6c2 100644 --- a/progs/trivial/tri.c +++ b/progs/trivial/tri.c @@ -60,10 +60,7 @@ static void Key(unsigned char key, int x, int y) switch (key) { case 27: -<<<<<<< HEAD:progs/trivial/tri.c glutDestroyWindow(win); -======= ->>>>>>> gallium-0.1:progs/trivial/tri.c exit(0); default: return; |