[tuhopuu-cvs] CVS commit: tuhopuu3/source/blender/render/intern/source rendercore.c tuhopuu3/source/blender/src buttons_editing.c buttons_shading.c space.c

[Chris Want]

hos (Chris Want) 2005/02/06 22:36:24 CET

  Modified files:
    tuhopuu3/source/blender/render/intern/source rendercore.c 
    tuhopuu3/source/blender/src buttons_editing.c 
                                buttons_shading.c space.c 
  
  Log:
  Post merge conflict resolution.
  
  Revision  Changes    Path
  1.8       +5 -15     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.7&r2=1.8&cvsroot=tuhopuu>
  1.11      +1 -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.10&r2=1.11&cvsroot=tuhopuu>
  1.9       +1 -0      tuhopuu3/source/blender/src/buttons_shading.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_shading.c.diff?r1=1.8&r2=1.9&cvsroot=tuhopuu>
  1.27      +1 -1      tuhopuu3/source/blender/src/space.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.26&r2=1.27&cvsroot=tuhopuu>