fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

trivial: remove stray merge conflict

Browse source
This commit is contained in:
Keith Whitwell 2008-09-11 20:11:11 +01:00
parent b66ee9e32f
commit fd0ee68305
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
progs/trivial/tri.c
View file

@ -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;