diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-07-22 01:11:58 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-07-22 01:11:58 +0400 |
| commit | 4532bd731d5edbe348d4df810856f6bdfdea705c (patch) | |
| tree | 778fdcd594b5f384eacf5cd82f50afc10bbed513 /source/blender/collada/CMakeLists.txt | |
| parent | cf34f7509f4ea8c3f0c92045933f089c72de5313 (diff) | |
| parent | bbfe3c9c49523d3987a3144da119d8f6afd09cf9 (diff) | |
Merge with trunk up to r38584.
Diffstat (limited to 'source/blender/collada/CMakeLists.txt')
| -rw-r--r-- | source/blender/collada/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index 260dd1a7073..91742727e16 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -28,13 +28,13 @@ remove_strict_flags() set(INC . - ../blenlib ../blenkernel + ../blenlib ../blenloader - ../windowmanager + ../editors/include ../makesdna ../makesrna - ../editors/include + ../windowmanager ../../../intern/guardedalloc ) |