blender/intern
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
..
audaspace Merged 2009-09-18 22:25:49 +00:00
boolop Merged 2009-09-18 22:25:49 +00:00
bsp Merged 2009-09-18 22:25:49 +00:00
container Merged 2009-09-18 22:25:49 +00:00
decimation Merged 2009-09-18 22:25:49 +00:00
elbeem Merged 2009-09-18 22:25:49 +00:00
ghost Merged 2009-09-18 22:25:49 +00:00
guardedalloc Merged 2009-09-18 22:25:49 +00:00
iksolver Merged 2009-09-18 22:25:49 +00:00
make Merged 2009-09-18 22:25:49 +00:00
memutil Merged 2009-09-18 22:25:49 +00:00
moto Merged 2009-09-18 22:25:49 +00:00
opennl Merged 2009-09-18 22:25:49 +00:00
smoke Merged 2009-09-18 22:25:49 +00:00
string Merged 2009-09-18 22:25:49 +00:00
CMakeLists.txt Merged 2009-09-18 22:25:49 +00:00
Makefile Merged 2009-09-18 22:25:49 +00:00
SConscript Merged 2009-09-18 22:25:49 +00:00