diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-10 16:43:52 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-10 16:43:52 +0300 |
commit | 496b510438b2f994cafcec6e36fe300be9fe015f (patch) | |
tree | 426f0e61c752535d2231459bcd2152c95c681e55 /build_files/build_environment/patches/cmakelists_glew.txt | |
parent | c116bb0c7fdae35fbb062260cc9581eb3b4f36cf (diff) | |
parent | 33ab011ae4928cbbb49115abf653d91b8f3ba4d2 (diff) |
Merge branch 'master' into id_copy_refactorid_copy_refactor
Conflicts:
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/space_sequencer/sequencer_edit.c
Diffstat (limited to 'build_files/build_environment/patches/cmakelists_glew.txt')
-rw-r--r-- | build_files/build_environment/patches/cmakelists_glew.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build_files/build_environment/patches/cmakelists_glew.txt b/build_files/build_environment/patches/cmakelists_glew.txt new file mode 100644 index 00000000000..ec36d4bde63 --- /dev/null +++ b/build_files/build_environment/patches/cmakelists_glew.txt @@ -0,0 +1,2 @@ +cmake_minimum_required (VERSION 2.4) +add_subdirectory(build/cmake)
\ No newline at end of file |