[Soc-2005-cvs] CVS commit: soc-blender/intern Makefile SConscript

[Emmanuel Stone]

eman (Emmanuel Stone) 2005/11/30 17:59:38 CET

  Modified files:        (Branch: eman)
    soc-blender/intern   Makefile SConscript 
  
  Log:
  merge conflict resolution
  
  Revision  Changes    Path
  1.1.1.1.4.3 +1 -1      soc-blender/intern/Makefile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/Makefile.diff?r1=1.1.1.1.4&r2=1.1.1.1.4.3&cvsroot=soc-2005&only_with_tag=eman>
  1.1.1.1.4.3 +1 -0      soc-blender/intern/SConscript
    <http://projects.blender.org/viewcvs/viewcvs.cgi/soc-blender/intern/SConscript.diff?r1=1.1.1.1.4&r2=1.1.1.1.4.3&cvsroot=soc-2005&only_with_tag=eman>