Merge branch 'merge-tcl-commands' of https://bitbucket.org/sopak/flatcam into tcl-commands

Browse Source

Conflicts:
	FlatCAMApp.py
	FlatCAMWorker.py
	termwidget.py

...

This commit is contained in:

Kamil Sopko

2016-03-31 18:03:48 +02:00

parent e941e55a4a e1e33e09e0

commit f4ef7baedb

5 changed files with 5 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

descartes/patch.pyc

Binary file not shown.