Tamara Hogenhout 38346dd95f Merge branch '15.06' ...

Conflicts:
	cura/CuraApplication.py

2015-06-10 15:18:45 +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

Render the build platform grid as a single sided plane

2015-06-03 20:29:53 +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

ConvexHullJob.py

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

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

ConvexHullNode.py

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

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

CuraApplication.py

Merge branch '15.06'

2015-06-10 15:18:45 +02:00

PlatformPhysics.py

Ignore selection when moving objects due to collision

2015-06-03 19:10:21 +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

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

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