diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-20 20:48:48 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-20 20:48:48 +0400 |
| commit | 55015daa43f0ab45341e316abcf11f23c87b5ebe (patch) | |
| tree | 3156892b6d807d9ba513d444adb870b0ae358e7a /source/blender/windowmanager/CMakeLists.txt | |
| parent | 1fe70c07a008185c4e5925aff2c214c93ff396b7 (diff) | |
| parent | a9e2e2279780ec2fb58e6820b9cad95ba03f4cad (diff) | |
Merged changes in the trunk up to revision 51448.
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesrna/intern/rna_main_api.c
Diffstat (limited to 'source/blender/windowmanager/CMakeLists.txt')
| -rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index dae0e9193c2..ffeb7aff6fa 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -29,6 +29,7 @@ set(INC ../blenkernel ../blenlib ../blenloader + ../compositor ../editors/include ../editors/io ../gpu @@ -37,7 +38,6 @@ set(INC ../makesdna ../makesrna ../nodes - ../compositor ../render/extern/include ../../gameengine/BlenderRoutines ../../../intern/elbeem/extern |