diff options
author | Joseph Eagar <joeedh@gmail.com> | 2009-01-30 18:48:38 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2009-01-30 18:48:38 +0300 |
commit | a64260263e5dcbb7e9626d96cf67f7a8ba398bab (patch) | |
tree | 1e4254ec5700c1dcf70a9b88b7bb311908017fc2 /source/blender/SConscript | |
parent | 78ffacad41ba9265173820f6e8064afdd9c20f62 (diff) | |
parent | b50ef7af146957c5c936f116ed5012db9e128c48 (diff) |
merge with 2.5 at r18751
Diffstat (limited to 'source/blender/SConscript')
-rw-r--r-- | source/blender/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/SConscript b/source/blender/SConscript index cd00776440a..f9bafcd804a 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -18,7 +18,8 @@ SConscript(['avi/SConscript', 'readblenfile/SConscript', 'render/SConscript', 'nodes/SConscript', - 'windowmanager/SConscript']) + 'windowmanager/SConscript', + 'blenfont/SConscript']) |