Arjen Hiemstra 9888a6eb42 Fix a merge error

2015-08-21 18:28:53 +02:00

..

__init__.py

Move src to cura so we can use the same package for installed and source

2015-05-18 15:03:42 +02:00

BuildVolume.py

Convert the last bits over to the changed API

2015-08-11 17:02:17 +02:00

CameraAnimation.py

Move src to cura so we can use the same package for installed and source

2015-05-18 15:03:42 +02:00

ConvexHullDecorator.py

Convert the last bits over to the changed API

2015-08-11 17:02:17 +02:00

ConvexHullJob.py

Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings

2015-08-21 13:29:30 +02:00

ConvexHullNode.py

Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings

2015-08-21 13:29:30 +02:00

CrashHandler.py

Print backtrace on console when we are not running a py2exe/py2app build

2015-08-19 19:13:44 +02:00

CuraActions.py

Defer opening the webbrowser until the next run of the event loop

2015-06-23 11:54:22 +02:00

CuraApplication.py

Fix a merge error

2015-08-21 18:28:53 +02:00

MultiMaterialDecorator.py

Added merging for multi material

2015-07-27 14:25:27 +02:00

OneAtATimeIterator.py

Fix convex hull and other bits so they use the new API

2015-08-18 18:11:32 +02:00

PlatformPhysics.py

Added preference to disable automatic push free

2015-08-20 11:53:30 +02:00

PlatformPhysicsOperation.py

Move src to cura so we can use the same package for installed and source

2015-05-18 15:03:42 +02:00

PrintInformation.py

Update all usage of activeMachine to the new API

2015-08-05 20:12:29 +02:00