Merge branch 'master' into tm_zero_elev_ui

This commit is contained in:
tamasmeszaros
2019-08-07 15:28:17 +02:00
4 changed files with 49 additions and 22 deletions

View File

@@ -1,6 +1,7 @@
#ifndef slic3r_GLTexture_hpp_
#define slic3r_GLTexture_hpp_
#include <atomic>
#include <string>
#include <vector>
#include <thread>