diff options
author | Ton Roosendaal <ton@blender.org> | 2007-12-24 22:13:04 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2007-12-24 22:13:04 +0300 |
commit | 25135a201b32f4c579758bfdd33fab36c0b12a7c (patch) | |
tree | 9c7bf88b3ab37ac79156768c967328c81abac645 /source/blender/blenkernel/Makefile | |
parent | 8c91939824ab992c4c28ad6d402259c6cf38c646 (diff) |
- removing conflicts in svn merge (didnt notice)
- adding more Makefiles
Diffstat (limited to 'source/blender/blenkernel/Makefile')
-rw-r--r-- | source/blender/blenkernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/Makefile b/source/blender/blenkernel/Makefile index 239941ec59b..0713d7af196 100644 --- a/source/blender/blenkernel/Makefile +++ b/source/blender/blenkernel/Makefile @@ -32,6 +32,6 @@ # Bounces make to subdirectories. SOURCEDIR = source/blender/blenkernel -DIRS = intern bad_level_call_stubs +DIRS = intern include nan_subdirs.mk |