diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-09-22 12:52:48 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-09-22 12:54:53 +0300 |
| commit | 2db84a8ee7cd3873e11eb0c13abc09869caa0042 (patch) | |
| tree | ea15209cc9742e23f36a7e692eb837723bfa64b3 /intern/CMakeLists.txt | |
| parent | a41ee7ea1ae9bb1bcc537576d9ffdb3bca3201f3 (diff) | |
Fix all merge conflicts
There was a lot of conflicts and to solve, I refresh manually the source folders.
Diffstat (limited to 'intern/CMakeLists.txt')
| -rw-r--r-- | intern/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index 6387fd016ba..e1dfc7043e9 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -11,7 +11,6 @@ add_subdirectory(memutil) add_subdirectory(opencolorio) add_subdirectory(opensubdiv) add_subdirectory(mikktspace) -add_subdirectory(glew-mx) add_subdirectory(eigen) add_subdirectory(sky) |