diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-01 18:08:18 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-01 18:08:18 +0400 |
commit | c9aa6cf80d0fce67ace4e2e43c5a39dc3cc4477f (patch) | |
tree | e3a8ddb0181b4cbed89e89e90604fb04a3064c98 /source/blender/compositor/CMakeLists.txt | |
parent | 1691414d44402c2730334a215c11e64351873967 (diff) | |
parent | 4fc4aa383b71a7d0a86eef29fd7ffa0383893f52 (diff) |
Merging r47307 through r47325 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/compositor/CMakeLists.txt')
-rw-r--r-- | source/blender/compositor/CMakeLists.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 6abc74700d6..c71168b2d2e 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -65,7 +65,6 @@ set(SRC intern/COM_NodeBase.h intern/COM_NodeOperation.cpp intern/COM_NodeOperation.h - intern/COM_NodeProgram.h intern/COM_Socket.cpp intern/COM_Socket.h intern/COM_SocketReader.cpp @@ -80,10 +79,6 @@ set(SRC intern/COM_MemoryProxy.h intern/COM_MemoryBuffer.cpp intern/COM_MemoryBuffer.h - intern/COM_MemoryManager.cpp - intern/COM_MemoryManager.h - intern/COM_MemoryManagerState.cpp - intern/COM_MemoryManagerState.h intern/COM_WorkScheduler.cpp intern/COM_WorkScheduler.h intern/COM_WorkPackage.cpp |