[Bf-blender-cvs] CVS commit: blender/extern Makefile

[Peter Schlaile]

schlaile (Peter Schlaile) 2006/06/25 21:16:45 CEST

  Modified files:
    blender/extern       Makefile 
  
  Log:
  == FFMPEG ==
  
  Merge conflict indicators left... arghh.
  
  Revision  Changes    Path
  1.20      +1 -6      blender/extern/Makefile
    <http://projects.blender.org/viewcvs/viewcvs.cgi/blender/extern/Makefile.diff?r1=1.19&r2=1.20&cvsroot=bf-blender>