diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-06-04 01:11:10 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-06-04 01:11:10 +0400 |
commit | 329b05dcd789bd8421661898697ed060c83b3286 (patch) | |
tree | 3d664826fefbe62078c878baab174e066eb48afa /source/blender/SConscript | |
parent | eabf741a8d76aa9400a071c37227504378fc6315 (diff) | |
parent | f9856c1c2da8139651eb59ff3bf174065d0f628c (diff) |
Merged changes in the trunk up to revision 47381.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/SConscript')
-rw-r--r-- | source/blender/SConscript | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript index 81e43273cfc..f602c93a208 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -7,7 +7,6 @@ SConscript(['avi/SConscript', 'blenkernel/SConscript', 'blenlib/SConscript', 'blenloader/SConscript', - 'blenpluginapi/SConscript', 'gpu/SConscript', 'opencl/SConscript', 'editors/SConscript', |