PublicCodeMirror/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-05-20 16:59:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/cpp_progress_status_bar' into dev

Browse Source 
# Conflicts:
#	lib/Slic3r/GUI/MainFrame.pm
#	xs/src/slic3r/AppController.cpp
#	xs/src/slic3r/AppControllerWx.cpp
#	xs/src/slic3r/GUI/GUI.hpp
This commit is contained in:
tamasmeszaros
2018-08-30 15:21:41 +02:00
parent 3750bd781e f5b1729af3
commit 4f53fc2a5f
21 changed files with 375 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xs/src/libslic3r/Print.cpp
View File

@@ -13,7 +13,7 @@
#include <boost/lexical_cast.hpp>
#include <boost/log/trivial.hpp>
#include "slic3r/IProgressIndicator.hpp"
#include "slic3r/ProgressIndicator.hpp"
#include "PrintExport.hpp"
//! macro used to mark string used at localization,