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
..
AUTHOR	== RED one (redcode) ==	2008-06-02 21:35:57 +00:00
codec.c	Merged	2009-09-18 22:25:49 +00:00
codec.h	== RED one (redcode) ==	2008-06-02 21:35:57 +00:00
debayer.c	== Redcode ==	2008-06-22 15:48:12 +00:00
debayer.h	== RED one (redcode) ==	2008-06-02 21:35:57 +00:00
format.c	Merged	2009-09-18 22:25:49 +00:00
format.h	Merged	2009-09-18 22:25:49 +00:00
LICENSE	== RED one (redcode) ==	2008-06-02 21:35:57 +00:00
NOTES	== RED one (redcode) ==	2008-06-02 21:35:57 +00:00
SConscript	Merged	2009-09-18 22:25:49 +00:00