[Soc-2006-cvs] CVS commit: soc-blender/source/blender/python/api2_2x/doc Mathutils.py Object.py

[Nicholas Bishop]

nicholasbishop (Nicholas Bishop) 2006/09/21 06:30:07 CEST

  Modified files:        (Branch: nicholasbishop)
    soc-blender/source/blender/python/api2_2x/doc Mathutils.py 
                                                  Object.py 
  
  Log:
  Additional merge fixes. (Should finally be ready to generate a patch)
  
  Revision  Changes    Path
  1.1.1.1.4.3 +0 -11     soc-blender/source/blender/python/api2_2x/doc/Mathutils.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/python/api2_2x/doc/Mathutils.py.diff?r1=1.1.1.1.4.2&r2=1.1.1.1.4.3&cvsroot=soc-2006&only_with_tag=nicholasbishop>
  1.1.1.1.4.4 +2 -2      soc-blender/source/blender/python/api2_2x/doc/Object.py
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/source/blender/python/api2_2x/doc/Object.py.diff?r1=1.1.1.1.4.3&r2=1.1.1.1.4.4&cvsroot=soc-2006&only_with_tag=nicholasbishop>