cvs commit: fptools/libraries/OpenGL Makefile package.conf.in fptools/libraries/OpenGL/Graphics/Rendering/OpenGL GL.hs fptools/libraries /OpenGL/Graphics/Rendering/OpenGL/GL Antialiasing.hs VertexArrays.hs BeginEnd.hs Clipping.hs Colors.hs CoordTrans.hs Extensions.hs PerFragment.hs PixelRect.hs ...

[Sven Panne]

panne       2003/06/08 04:26:28 PDT

  Modified files:        (Branch: ghc-6-0-branch)
    libraries/OpenGL     Makefile package.conf.in 
    libraries/OpenGL/Graphics/Rendering/OpenGL GL.hs 
    libraries/OpenGL/Graphics/Rendering/OpenGL/GL BeginEnd.hs 
                                                  Clipping.hs 
                                                  Colors.hs 
                                                  CoordTrans.hs 
                                                  Extensions.hs 
                                                  PerFragment.hs 
                                                  PixelRect.hs 
                                                  RasterPos.hs 
                                                  VertexSpec.hs 
    libraries/OpenGL/Graphics/Rendering/OpenGL/GLU Matrix.hs 
                                                   Mipmapping.hs 
    libraries/OpenGL/include HsOpenGL.h HsOpenGLExt.h 
  Added files:           (Branch: ghc-6-0-branch)
    libraries/OpenGL/Graphics/Rendering/OpenGL/GL Antialiasing.hs 
                                                  VertexArrays.hs 
    libraries/OpenGL/cbits .cvsignore HsOpenGL.c Makefile 
  Removed files:         (Branch: ghc-6-0-branch)
    libraries/OpenGL/Graphics/Rendering/OpenGL/GL VertexArray.hs 
  Log:
  Merged with HEAD.
  
  Although this entails some API changes (mostly additions), probably
  nobody was able to build the OpenGL package from the release branch
  without some modifications, anyway. Furthermore, I'm slowly running
  out of CPU- and brain cycles to selectively merge the fixes...
  
  Revision  Changes    Path
  1.17.2.4  +3 -3      fptools/libraries/OpenGL/Makefile
  1.1.2.1   +3 -2      fptools/libraries/OpenGL/package.conf.in
  1.22.2.1  +4 -2      fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GL.hs
  1.9.2.1   +20 -8     fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GL/BeginEnd.hs
  1.2.2.1   +10 -3     fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GL/Clipping.hs
  1.6.2.1   +11 -7     fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GL/Colors.hs
  1.11.2.1  +107 -59   fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GL/CoordTrans.hs
  1.5.2.2   +3 -8      fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GL/Extensions.hs
  1.2.2.1   +2 -5      fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GL/PerFragment.hs
  1.2.2.1   +50 -1     fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GL/PixelRect.hs
  1.3.2.1   +76 -96    fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GL/RasterPos.hs
  1.14.2.1  +124 -114  fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GL/VertexSpec.hs
  1.9.2.1   +25 -21    fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GLU/Matrix.hs
  1.4.2.1   +1 -2      fptools/libraries/OpenGL/Graphics/Rendering/OpenGL/GLU/Mipmapping.hs
  1.2.2.1   +5 -4      fptools/libraries/OpenGL/include/HsOpenGL.h
  1.1.2.1   +8 -6      fptools/libraries/OpenGL/include/HsOpenGLExt.h