[Bf-blender-cvs] CVS commit: blender/source/blender/blenkernel/intern action.c blender/source/blender/python/api2_2x Image.c blender/source/blender/python/api2_2x/doc Image.py

[Ton Roosendaal]

ton (Ton Roosendaal) 2005/12/14 15:24:23 CET

  Modified files:        (Branch: orange)
    blender/source/blender/blenkernel/intern action.c 
    blender/source/blender/python/api2_2x Image.c 
    blender/source/blender/python/api2_2x/doc Image.py 
  
  Log:
  Wednesday merger of Orange branch and bf-blender
  
  Revision  Changes    Path
  1.47.2.4  +4 -2      blender/source/blender/blenkernel/intern/action.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/blenkernel/intern/action.c.diff?r1=1.47.2.3&r2=1.47.2.4&cvsroot=bf-blender>
  1.35.2.2  +163 -26   blender/source/blender/python/api2_2x/Image.c
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/Image.c.diff?r1=1.35.2.1&r2=1.35.2.2&cvsroot=bf-blender>
  1.11.2.2  +51 -3     blender/source/blender/python/api2_2x/doc/Image.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/source/blender/python/api2_2x/doc/Image.py.diff?r1=1.11.2.1&r2=1.11.2.2&cvsroot=bf-blender>