Commit Graph

5 Commits

Author SHA1 Message Date
be50ce61be Merged
https://svn.blender.org/svnroot/bf-blender/branches/soc-2008-mxcurioni (r22789) and
https://svn.blender.org/svnroot/bf-blender/trunk/blender (r23338)
with the "Ignore ancestry" and "Ignore line endings" options enabled (using
TortoiseSVN on Windows).

After the merge operation, all changes (i.e., deletion) in source/blender/freestyle/
were reverted in order to keep the primary source tree of the Freestyle renderer.
2009-09-18 22:25:49 +00:00
5b7398ce53 Updated Mac OS X icons courtesy of Erik Mendoza, re. this thread on blender.org:
http://www.blender.org/forum/viewtopic.php?t=8121
2006-02-13 21:08:43 +00:00
8f4f2e5235 Correct icons for OSX 2004-04-28 21:19:18 +00:00
f157940432 - convert darwin icon files to binary 2004-04-24 18:34:08 +00:00
Hans Lambermont
12315f4d0e Initial revision 2002-10-12 11:37:38 +00:00