blender/source/darwin/blenderplayer.app/Contents
Tamito Kajiyama 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
..
MacOS Initial revision 2002-10-12 11:37:38 +00:00
Resources Merged 2009-09-18 22:25:49 +00:00
Info.plist Removed nantechnologies from identifierstring :) 2004-09-28 20:59:14 +00:00
PkgInfo Initial revision 2002-10-12 11:37:38 +00:00