[tuhopuu-cvs] CVS commit: tuhopuu2/source/blender/include BDR_drawobject.h BSE_buttons.h mydevice.h tuhopuu2/source/blender/src editobject.c editsca.c editscreen.c rendersettings.c resources.c toolbox.c view.c

[Chris Want]

hos (Chris Want) 2003/11/10 19:33:40 CET

  Modified files:
    tuhopuu2/source/blender/include BDR_drawobject.h BSE_buttons.h 
                                    mydevice.h 
    tuhopuu2/source/blender/src editobject.c editsca.c 
                                editscreen.c rendersettings.c 
                                resources.c toolbox.c view.c 
  
  Log:
  Merge fixing -- Part 2
  
  Revision  Changes    Path
  1.9       +2 -2      tuhopuu2/source/blender/include/BDR_drawobject.h
  1.2       +2 -2      tuhopuu2/source/blender/include/BSE_buttons.h
  1.3       +2 -1      tuhopuu2/source/blender/include/mydevice.h
  1.28      +84 -431   tuhopuu2/source/blender/src/editobject.c
  1.3       +2 -1      tuhopuu2/source/blender/src/editsca.c
  1.8       +5 -62     tuhopuu2/source/blender/src/editscreen.c
  1.3       +2 -1      tuhopuu2/source/blender/src/rendersettings.c
  1.5       +65 -583   tuhopuu2/source/blender/src/resources.c
  1.4       +2 -2      tuhopuu2/source/blender/src/toolbox.c
  1.8       +1 -17     tuhopuu2/source/blender/src/view.c