tamasmeszaros 99f6866a1d Merge branch 'feature_slice_to_png' of github.com:prusa3d/Slic3r into feature_slice_to_png ... # Conflicts: # xs/src/slic3r/AppController.cpp # xs/src/slic3r/AppController.hpp		2018-06-25 17:13:36 +02:00
..
lib/Slic3r	Layers editing shader moved to c++	2018-05-25 14:05:08 +02:00
src	Merge branch 'feature_slice_to_png' of github.com:prusa3d/Slic3r into feature_slice_to_png	2018-06-25 17:13:36 +02:00
t	Removed the "Broken croak" support, which was useful on broken	2018-05-03 21:45:43 +02:00
xsp	Merge remote-tracking branch 'origin/master' into feature_slice_to_png	2018-06-25 13:24:37 +02:00
CMakeLists.txt	Merge branch 'feature_slice_to_png' of github.com:prusa3d/Slic3r into feature_slice_to_png	2018-06-25 17:13:36 +02:00
main.xs.in