cvs commit: fptools/libraries/OpenGL/Graphics/Rendering/OpenGL GL.hs fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GL Face.hs LineSegments.hs Points.hs Polygons.hs BeginEnd.hs Colors.hs VertexSpec.hs fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GLU Exception.hs Quadrics.hs Tessellation.hs

[Sven Panne]

panne       2003/06/17 04:18:55 PDT

  Modified files:        (Branch: ghc-6-0-branch)
    libraries/OpenGL/Graphics/Rendering/OpenGL GL.hs 
    libraries/OpenGL/Graphics/Rendering/OpenGL/GL BeginEnd.hs 
                                                  Colors.hs 
                                                  VertexSpec.hs 
    libraries/OpenGL/Graphics/Rendering/OpenGL/GLU Quadrics.hs 
                                                   Tessellation.hs 
  Added files:           (Branch: ghc-6-0-branch)
    libraries/OpenGL/Graphics/Rendering/OpenGL/GL Face.hs 
                                                  LineSegments.hs 
                                                  Points.hs 
                                                  Polygons.hs 
    libraries/OpenGL/Graphics/Rendering/OpenGL/GLU Exception.hs 
  Log:
  Merged with HEAD again.
  
  Perhaps *this* time it will result in a working WinDoze
  version... *sigh*
  
  Revision  Changes    Path
  1.22.2.2  +6 -0      fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GL.hs
  1.9.2.2   +9 -4      fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GL/BeginEnd.hs
  1.6.2.2   +2 -21     fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GL/Colors.hs
  1.14.2.2  +1 -1      fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GL/VertexSpec.hs
  1.9.2.1   +9 -9      fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GLU/Quadrics.hs
  1.12.2.1  +1 -1      fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GLU/Tessellation.hs