Commit Graph

7 Commits

Author SHA1 Message Date
4600f6c867 Merge remote-tracking branch 'origin/cpp_progress_status_bar' into dev
# Conflicts:
#	lib/Slic3r/GUI/MainFrame.pm
#	xs/src/slic3r/AppController.cpp
#	xs/src/slic3r/AppControllerWx.cpp
#	xs/src/slic3r/GUI/GUI.hpp
2018-08-30 17:35:49 +02:00
46fb4a9d8f working C++ status bar.
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
2018-08-30 11:55:10 +02:00
6b21e5bd3c Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-07-18 10:14:28 +02:00
f0b44f95e2 AppController integration 2018-06-28 18:47:18 +02:00
4ee61008ef Comments and refactoring 2018-06-26 17:02:46 +02:00
935bd252e2 Slicing in C++ with progress indication. 2018-06-20 14:50:18 +02:00
e51c13841b AppController class created to take the necessary app logic into C++. 2018-06-19 17:45:21 +02:00