diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-21 01:22:15 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-21 01:22:15 +0400 |
| commit | 9c42afb1c02cafa21632bd2e19b47c012a230368 (patch) | |
| tree | 90d7e190e9ba59437f1e3e31337984a2200aa764 /source/blender/python/intern/CMakeLists.txt | |
| parent | 5582d9fac13123397297db54a0478a63a1b75194 (diff) | |
| parent | 8f5112f191e24aac86da7b70f461a50825e764da (diff) | |
Merged changes in the trunk up to revision 40413.
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
Diffstat (limited to 'source/blender/python/intern/CMakeLists.txt')
| -rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index 3ad5e000233..3bf22d26af4 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -48,6 +48,7 @@ set(SRC bpy_app_handlers.c bpy_driver.c bpy_interface.c + bpy_interface_atexit.c bpy_intern_string.c bpy_library.c bpy_operator.c |