Merged changes in the trunk up to revision 36757.

2011-05-19 01:40:37 +00:00
parent 31471f644c c04f9b779c
commit dfcd015535
275 changed files with 4189 additions and 3664 deletions
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -13,7 +13,6 @@ SConscript(['avi/SConscript',
            'imbuf/SConscript',
            'makesdna/SConscript',
            'makesrna/SConscript',
-            'readblenfile/SConscript',
            'render/SConscript',
            'nodes/SConscript',
            'modifiers/SConscript',