From 254d8e9db5160d26685e1951dae3649d959e6bec Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Thu, 31 May 2018 19:45:58 +0300 Subject: [PATCH] Merge https://bitbucket.org/jpcgt/flatcam/src/master into auto_select_line_entry_content # Conflicts: # FlatCAMDraw.py --- FlatCAMDraw.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FlatCAMDraw.py b/FlatCAMDraw.py index 757dd8ee..6a3ccc3d 100644 --- a/FlatCAMDraw.py +++ b/FlatCAMDraw.py @@ -733,7 +733,7 @@ class FlatCAMDraw(QtCore.QObject): self.snap_toolbar.addWidget(self.grid_gap_y_entry) - self.corner_snap_btn = self.snap_toolbar.addAction(QtGui.QIcon('share:corner32.png'), 'Snap to corner') + self.corner_snap_btn = self.snap_toolbar.addAction(QtGui.QIcon('share/corner32.png'), 'Snap to corner') self.snap_max_dist_entry = FCEntry() self.snap_max_dist_entry.setMaximumWidth(70)