blender/config
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
..
darwin-config.py Merged 2009-09-18 22:25:49 +00:00
irix6-config.py Merged 2009-09-18 22:25:49 +00:00
linux2-config.py Merged 2009-09-18 22:25:49 +00:00
linuxcross-config.py Merged 2009-09-18 22:25:49 +00:00
openbsd3-config.py Merged 2009-09-18 22:25:49 +00:00
sunos5-config.py Merged 2009-09-18 22:25:49 +00:00
win32-mingw-config.py Merged 2009-09-18 22:25:49 +00:00
win32-vc-config.py Merged 2009-09-18 22:25:49 +00:00
win64-vc-config.py Merged 2009-09-18 22:25:49 +00:00