Merge remote-tracking branch 'origin/master'

Browse source

Conflicts:
	Cura/webui/printer.py

...

This commit is contained in:

Gina Häußge 2012-12-29 16:09:21 +01:00

parent 39b3639d69 5008502e13

commit 04b531909d

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

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available