Merge master and fix conflicts

1 files changed, 2 insertions, 5 deletions

diff --git a/progs/samples/prim.c b/progs/samples/prim.c
index f47c60faef..c04750725f 100644
--- a/progs/samples/prim.c
+++ b/progs/samples/prim.c
@@ -466,25 +466,22 @@ static void Draw(void)
     } else {
 	glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
     }
-#if 01
+
     Viewport(0, 0); Point();
     Viewport(0, 1); Lines();
     Viewport(0, 2); LineStrip();
     Viewport(0, 3); LineLoop();
 
     Viewport(1, 0); Bitmap();
-
     Viewport(1, 1); TriangleFan();
     Viewport(1, 2); Triangles();
     Viewport(1, 3); TriangleStrip();
 
     Viewport(2, 0); Rect();
-#endif
     Viewport(2, 1); PolygonFunc();
-#if 01
     Viewport(2, 2); Quads();
     Viewport(2, 3); QuadStrip();
-#endif
+
     glFlush();
 
     if (doubleBuffer) {