cvs commit: fptools/libraries/GLUT prologue.txt .cvsignore Makefile fptools/libraries/GLUT/Graphics/UI .cvsignore GLUT.hs fptools/libraries/GLUT/Graphics/UI/GLUT Debugging.hs GameMode.hs .cvsignore Begin.hs Callbacks.hs Colormap.hs Constants.hs Fonts.hs ...

[Sven Panne]

  Modified files:        (Branch: ghc-5-04-branch)
    libraries/GLUT       .cvsignore Makefile 
    libraries/GLUT/Graphics/UI .cvsignore GLUT.hs 
    libraries/GLUT/Graphics/UI/GLUT .cvsignore Begin.hs 
                                    Callbacks.hs Colormap.hs 
                                    Constants.hs Fonts.hs 
                                    Initialization.hs Menu.hs 
                                    Objects.hs State.hs Window.hs 
    libraries/GLUT/Graphics/UI/GLUT/Callbacks .cvsignore Global.hs 
                                              Registration.hs 
                                              Window.hs 
  Added files:           (Branch: ghc-5-04-branch)
    libraries/GLUT       prologue.txt 
    libraries/GLUT/Graphics/UI/GLUT Debugging.hs GameMode.hs 
  Log:
  Merged with HEAD. In conjunction with the previous death of the hslibs
  version, this should lower the HOpenGL versionitis quite a bit.
  
  Revision  Changes    Path
  1.1.2.1   +5 -2      fptools/libraries/GLUT/.cvsignore
  1.9.2.2   +12 -3     fptools/libraries/GLUT/Makefile
  1.1.2.1   +2 -0      fptools/libraries/GLUT/Graphics/UI/.cvsignore
  1.9.2.1   +28 -20    fptools/libraries/GLUT/Graphics/UI/GLUT.hs
  1.1.2.1   +4 -0      fptools/libraries/GLUT/Graphics/UI/GLUT/.cvsignore
  1.2.2.1   +1 -1      fptools/libraries/GLUT/Graphics/UI/GLUT/Begin.hs
  1.1.2.1   +8 -1      fptools/libraries/GLUT/Graphics/UI/GLUT/Callbacks.hs
  1.3.2.1   +3 -3      fptools/libraries/GLUT/Graphics/UI/GLUT/Colormap.hs
  1.5.2.1   +5 -2      fptools/libraries/GLUT/Graphics/UI/GLUT/Constants.hs
  1.4.2.1   +13 -12    fptools/libraries/GLUT/Graphics/UI/GLUT/Fonts.hs
  1.7.2.1   +51 -53    fptools/libraries/GLUT/Graphics/UI/GLUT/Initialization.hs
  1.1.2.1   +174 -30   fptools/libraries/GLUT/Graphics/UI/GLUT/Menu.hs
  1.2.2.1   +31 -26    fptools/libraries/GLUT/Graphics/UI/GLUT/Objects.hs
  1.3.2.1   +3 -3      fptools/libraries/GLUT/Graphics/UI/GLUT/State.hs
  1.9.2.1   +25 -23    fptools/libraries/GLUT/Graphics/UI/GLUT/Window.hs
  1.1.2.1   +2 -0      fptools/libraries/GLUT/Graphics/UI/GLUT/Callbacks/.cvsignore
  1.2.2.1   +4 -10     fptools/libraries/GLUT/Graphics/UI/GLUT/Callbacks/Global.hs
  1.1.2.1   +3 -2      fptools/libraries/GLUT/Graphics/UI/GLUT/Callbacks/Registration.hs
  1.3.2.1   +660 -5    fptools/libraries/GLUT/Graphics/UI/GLUT/Callbacks/Window.hs