tamasmeszaros f11dd98cc4 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d ...

# Conflicts:
#	CMakeLists.txt
#	lib/Slic3r/GUI/MainFrame.pm

2018-06-28 18:50:39 +02:00

..

Slic3r

Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d

2018-06-28 18:50:39 +02:00

Slic3r.pm

Merge branch 'cpp_ui_optimization' into updating

2018-04-27 12:04:43 +02:00