tamasmeszaros 4f53fc2a5f 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
..
Slic3r	Merge remote-tracking branch 'origin/cpp_progress_status_bar' into dev	2018-08-30 17:35:49 +02:00
Slic3r.pm	working C++ status bar.	2018-08-30 11:55:10 +02:00