Lukas Matena d662bf2a18 Fixing conflicts part 3: ... Some files have whitespace changes that make resolving conflicts difficult. Take the version from master first, next commit will apply changes from master_250		2022-06-29 16:43:29 +02:00
..
admesh
agg
avrdude
boost
build-utils
clipper	Backported a fix from Clipper 6.4.2 for the issue that Clipper Z coordinated has incorrect value because ZFillFunction wasn't called in all cases (https://sourceforge.net/p/polyclipping/bugs/160/). Also, this issue led to duplicity vertices with the same XY coordinates but differ in Z coordinates.	2022-06-09 11:05:05 +02:00
eigen
fast_float
glu-libtess
hidapi
hints	Fix of Boost 1.79 deprecated boost::filesystem::ofstream #8238	2022-04-25 08:33:48 +02:00
imgui
libigl
libnest2d
libslic3r	Fixing conflicts part 3:	2022-06-29 16:43:29 +02:00
miniz
nanosvg
platform
qoi	WIP: Implemented support for QOI G-code thumbnail format as requested	2022-06-08 21:12:00 +02:00
semver
Shiny
slic3r	Fixing conflicts part 3:	2022-06-29 16:43:29 +02:00
stb_dxt
CMakeLists.txt	Revert "Merge branch 'pm_stable_meshfix' into dev_250"	2022-06-17 16:13:18 +02:00
PrusaSlicer_app_msvc.cpp	When, on Windows, the application tries to automatically switch to MESA OpenGL library and the system opengl32.dll is not unloaded, prompt the user with a dialog asking to rerun using the --sw-renderer option	2022-05-24 10:20:02 +02:00
PrusaSlicer.cpp	Suppressed reports of memory leaks from AMD driver and D-Bus library.	2022-05-05 13:39:35 +02:00
PrusaSlicer.hpp