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
..
AUD_JackDevice.cpp	Merged	2009-09-18 22:25:49 +00:00
AUD_JackDevice.h	Merged	2009-09-18 22:25:49 +00:00
Makefile	Merged	2009-09-18 22:25:49 +00:00