[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/projectfiles/gameengine/gamelogic SCA_gamelogic.dsp tuhopuu3/source/blender/blenlib/intern arithb.c tuhopuu3/source/blender/render/intern/source rendercore.c tuhopuu3/source/blender/src buttons_editing.c buttons_shading.c drawobject.c drawview.c ...

[Chris Want]

hos (Chris Want) 2005/01/30 22:47:14 CET

  Modified files:
    tuhopuu3/doc         merge-howto-tuhopuu3.txt 
    tuhopuu3/projectfiles/gameengine/gamelogic SCA_gamelogic.dsp 
    tuhopuu3/source/blender/blenlib/intern arithb.c 
    tuhopuu3/source/blender/render/intern/source rendercore.c 
    tuhopuu3/source/blender/src buttons_editing.c 
                                buttons_shading.c drawobject.c 
                                drawview.c previewrender.c space.c 
    tuhopuu3/source/gameengine/GameLogic/Joystick SCA_Joystick.h 
  
  Log:
  Post merge conflict resolution.
  
  Revision  Changes    Path
  1.3       +6 -4      tuhopuu3/doc/merge-howto-tuhopuu3.txt
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.3       +28 -0     tuhopuu3/projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/gameengine/gamelogic/SCA_gamelogic.dsp.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
  1.5       +7 -7      tuhopuu3/source/blender/blenlib/intern/arithb.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/arithb.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.6       +111 -74   tuhopuu3/source/blender/render/intern/source/rendercore.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/render/intern/source/rendercore.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.8       +4 -1      tuhopuu3/source/blender/src/buttons_editing.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
  1.6       +2 -2      tuhopuu3/source/blender/src/buttons_shading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_shading.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.11      +22 -20    tuhopuu3/source/blender/src/drawobject.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
  1.6       +2 -1      tuhopuu3/source/blender/src/drawview.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
  1.5       +3 -0      tuhopuu3/source/blender/src/previewrender.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/previewrender.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
  1.25      +2 -3      tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
  1.3       +0 -1      tuhopuu3/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/gameengine/GameLogic/Joystick/SCA_Joystick.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>