diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-07-26 07:55:23 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-26 07:55:23 +0400 |
commit | fc95382a977163a1d499c732960e7501cc065833 (patch) | |
tree | 3bbbe419ba513f030f95715c04a8adb39c6e6579 /source/blender/editors/space_image/CMakeLists.txt | |
parent | ac2dd4099167d9ab6306f3fcb83610a5d01ffae1 (diff) | |
parent | ce0ad0b40b93fc6074daaba6ead0e0e82867d4d2 (diff) |
svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/editors/space_image/CMakeLists.txt')
-rw-r--r-- | source/blender/editors/space_image/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 8e2836388cb..d811f018618 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -23,14 +23,14 @@ set(INC ../include ../../blenfont ../../blenkernel - ../../blenloader ../../blenlib + ../../blenloader ../../imbuf ../../bmesh ../../makesdna ../../makesrna - ../../windowmanager ../../render/extern/include + ../../windowmanager ../../../../intern/guardedalloc ) |