b61714bb3e
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.idx CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.ini CONFLICT (content): Merge conflict in src/libslic3r/CMakeLists.txt CONFLICT (content): Merge conflict in src/libslic3r/Fill/Fill.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode.hpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.hpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.hpp CONFLICT (add/add): Merge conflict in src/libslic3r/Geometry/Curves.hpp CONFLICT (content): Merge conflict in src/libslic3r/PerimeterGenerator.cpp CONFLICT (content): Merge conflict in src/libslic3r/Point.hpp CONFLICT (content): Merge conflict in src/libslic3r/PrintConfig.hpp CONFLICT (content): Merge conflict in src/slic3r/GUI/ConfigWizard.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/GCodeViewer.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/GLCanvas3D.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/GUI_App.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp CONFLICT (content): Merge conflict in src/slic3r/Utils/FixModelByWin10.cpp CONFLICT (modify/delete): t/perimeters.t deleted in HEAD and modified in master_250. Version master_250 of t/perimeters.t left in tree. CONFLICT (content): Merge conflict in tests/fff_print/CMakeLists.txt CONFLICT (content): Merge conflict in tests/fff_print/test_fill.cpp CONFLICT (content): Merge conflict in version.inc CONFLICT (modify/delete): xs/xsp/PerimeterGenerator.xsp deleted in HEAD and modified in master_250. Version master_250 of xs/xsp/PerimeterGenerator.xsp left in tree.
16 lines
582 B
PHP
16 lines
582 B
PHP
# Included by CMakeLists, edited by the build script
|
|
# (the version numbers are generated by the build script from the git current label)
|
|
|
|
set(SLIC3R_APP_NAME "PrusaSlicer")
|
|
set(SLIC3R_APP_KEY "PrusaSlicer")
|
|
<<<<<<< HEAD
|
|
set(SLIC3R_VERSION "2.6.0-alpha0")
|
|
set(SLIC3R_BUILD_ID "PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN")
|
|
set(SLIC3R_RC_VERSION "2,6,0,0")
|
|
set(SLIC3R_RC_VERSION_DOTS "2.6.0.0")
|
|
=======
|
|
set(SLIC3R_VERSION "2.5.0-alpha2")
|
|
set(SLIC3R_BUILD_ID "PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN")
|
|
set(SLIC3R_RC_VERSION "2,5,0,0")
|
|
set(SLIC3R_RC_VERSION_DOTS "2.5.0.0")
|
|
>>>>>>> master_250
|