3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed conflicts after merge

Browse source
This commit is contained in:
Lukas Matena 2022-08-15 14:02:50 +02:00
parent bce2b148f4
commit deac513faa
13 changed files with 280 additions and 6844 deletions
Download patch file Download diff file Expand all files Collapse all files

3
deps/CMakeLists.txt vendored
View file

@ -205,11 +205,8 @@ set(_dep_list
dep_OpenVDB
dep_OpenCSG
dep_CGAL
<<<<<<< HEAD
dep_Qhull
=======
dep_OCCT
>>>>>>> master_250
${PNG_PKG}
${ZLIB_PKG}
${EXPAT_PKG}