Joseph Lenox
a9b3b0ab7f
Merge remote-tracking branch 'thethirdone/Scene3D' into test-merge-thethirdone-3d-plater
# Conflicts:
# .gitignore
# .travis.yml
# README.md
# package/linux/travis-setup.sh
# src/CMakeLists.txt
# src/GUI/ColorScheme/Default.hpp
# src/GUI/Plater.cpp
# src/GUI/Plater/Plate2D.cpp
# src/GUI/Plater/Plate3D.hpp
# src/GUI/Plater/Preview3D.hpp
# src/GUI/Preset.hpp
# src/GUI/misc_ui.cpp
# src/GUI/misc_ui.hpp
# src/slic3r.cpp
# src/test/GUI/test_field_checkbox.cpp
# xs/src/libslic3r/Config.cpp
# xs/src/libslic3r/Config.hpp
# xs/src/libslic3r/ConfigBase.cpp
# xs/src/libslic3r/ConfigBase.hpp
# xs/src/libslic3r/Log.hpp
2018-07-17 17:35:05 -05:00
..
2017-12-21 10:39:47 -06:00
2017-04-07 22:15:18 +02:00
2016-12-16 15:49:41 +01:00
2016-12-16 15:49:41 +01:00
2016-12-16 15:49:41 +01:00
2017-05-10 23:21:22 +02:00
2016-12-16 15:49:41 +01:00
2016-12-16 15:49:41 +01:00
2016-12-16 15:49:41 +01:00
2016-12-16 15:49:41 +01:00
2018-07-11 22:41:51 -05:00
2017-03-03 20:12:56 +01:00
2017-04-04 18:51:06 +02:00
2017-04-02 17:14:07 +02:00
2016-12-16 15:49:41 +01:00
2016-12-16 15:49:41 +01:00
2016-12-17 00:41:45 +01:00
2017-05-01 17:00:02 +02:00
2016-12-16 15:49:41 +01:00
2017-04-08 10:57:16 +02:00
2017-05-21 16:34:19 +02:00
2018-05-22 19:25:02 -04:00
2016-12-16 15:49:41 +01:00
2016-12-16 15:49:41 +01:00
2016-12-16 15:49:41 +01:00
2017-04-29 10:38:00 +02:00
2017-03-17 18:53:13 +01:00
2017-03-13 23:47:52 +01:00
2016-12-16 15:49:41 +01:00
2017-03-04 14:23:03 +01:00
2017-10-21 17:16:49 -05:00
2016-12-16 15:49:41 +01:00
2016-12-16 15:49:41 +01:00
2016-12-16 15:49:41 +01:00
2016-12-16 15:49:41 +01:00