merge with trunk/2.5 at r23876

[[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
parent 36bb566d4e
commit 8f788c64db
1313 changed files with 104799 additions and 120780 deletions
--- a/intern/SConscript
+++ b/intern/SConscript
@@ -10,6 +10,7 @@ SConscript(['audaspace/SConscript',
            'memutil/SConscript/',
            'decimation/SConscript',
            'iksolver/SConscript',
+            'itasc/SConscript',
            'boolop/SConscript',
            'opennl/SConscript',
            'smoke/SConscript'])