kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
24c48df98e
blender/intern/audaspace
History
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
..
ffmpeg Merged 2009-09-18 22:25:49 +00:00
FX Merged 2009-09-18 22:25:49 +00:00
intern Merged 2009-09-18 22:25:49 +00:00
jack Merged 2009-09-18 22:25:49 +00:00
make/msvc_9_0 Merged 2009-09-18 22:25:49 +00:00
OpenAL Merged 2009-09-18 22:25:49 +00:00
SDL Merged 2009-09-18 22:25:49 +00:00
sndfile Merged 2009-09-18 22:25:49 +00:00
SRC Merged 2009-09-18 22:25:49 +00:00
CMakeLists.txt Merged 2009-09-18 22:25:49 +00:00
COPYING Merged 2009-09-18 22:25:49 +00:00
COPYING.LESSER 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