[tuhopuu-cvs] CVS commit: tuhopuu2/source/gameengine/BlenderRoutines KX_BlenderRenderTools.cpp tuhopuu2/source/gameengine/GamePlayer/common GPC_RenderTools.cpp GPC_RenderTools.h tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer RAS_OpenGLRasterizer.cpp EXT_separate_specular_color.h

[Kester Maddock]

kester (Kester Maddock) 2004/07/04 14:53:03 CEST

  Modified files:
    tuhopuu2/source/gameengine/BlenderRoutines 
                                               KX_BlenderRenderTools.cpp 
    tuhopuu2/source/gameengine/GamePlayer/common 
                                                 GPC_RenderTools.cpp 
                                                 GPC_RenderTools.h 
    tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
                                                               RAS_OpenGLRasterizer.cpp 
  Removed files:
    tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer 
                                                               EXT_separate_specular_color.h 
  
  Log:
  Post merge conflict resolution (game engine)
  
  Revision  Changes    Path
  1.13      +2 -74     tuhopuu2/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.13      +1 -18     tuhopuu2/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
  1.7       +1 -11     tuhopuu2/source/gameengine/GamePlayer/common/GPC_RenderTools.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/GamePlayer/common/GPC_RenderTools.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
  1.18      +1 -4      tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu2/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>