be50ce61be
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.
30 lines
537 B
Plaintext
30 lines
537 B
Plaintext
Microsoft Developer Studio Workspace File, Format Version 6.00
|
|
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
|
|
|
|
###############################################################################
|
|
|
|
Project: "string"=".\string.dsp" - Package Owner=<4>
|
|
|
|
Package=<5>
|
|
{{{
|
|
}}}
|
|
|
|
Package=<4>
|
|
{{{
|
|
}}}
|
|
|
|
###############################################################################
|
|
|
|
Global:
|
|
|
|
Package=<5>
|
|
{{{
|
|
}}}
|
|
|
|
Package=<3>
|
|
{{{
|
|
}}}
|
|
|
|
###############################################################################
|
|
|