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

4
version.inc
View file

@ -3,11 +3,7 @@
set(SLIC3R_APP_NAME "PrusaSlicer")
set(SLIC3R_APP_KEY "PrusaSlicer")
<<<<<<< HEAD
set(SLIC3R_VERSION "2.6.0-alpha0")
=======
set(SLIC3R_VERSION "2.5.0-beta1")
>>>>>>> master_250
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")