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/editors/space_nla | |
parent | cf34f7509f4ea8c3f0c92045933f089c72de5313 (diff) | |
parent | bbfe3c9c49523d3987a3144da119d8f6afd09cf9 (diff) |
Merge with trunk up to r38584.
Diffstat (limited to 'source/blender/editors/space_nla')
-rw-r--r-- | source/blender/editors/space_nla/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index 1bf04f4dc37..b05d157365d 100644 --- a/source/blender/editors/space_nla/CMakeLists.txt +++ b/source/blender/editors/space_nla/CMakeLists.txt @@ -22,8 +22,8 @@ set(INC ../include ../../blenkernel - ../../blenloader ../../blenlib + ../../blenloader ../../makesdna ../../makesrna ../../windowmanager |