Arjen Hiemstra 57b2ce4f3e Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings ... * 'master' of github.com:ultimaker/Cura: (49 commits) 15.10 restyling of the sidebar header 15.10 restyling of the sidebar header 15.10 restyling of the sidebar split magic_mesh)surface_mode into Normal, Surface, Both Added preference to disable automatic scale Removed unused import Added changeLog plugin Added missing ) Merging of mine and Jaimes work Removed font from rectangle JSON: git diff! removed triangles and grid top/bottom skin options (though they are available) Code style & switch to translation catalog 15.10 re-alignment of the toolbar 15.10 New Icons 15.10 restyling of the savebutton Area Added message asking about sending data to server Added exception handling for checking overlap. Fixed default button for general and view page Fixed double ID in qml Removed unused import ...		2015-09-01 15:44:19 +02:00
..
3MFReader	Port 3MFReader to ETree	2015-08-18 17:15:35 +02:00
ChangeLogPlugin	Added changeLog plugin	2015-08-28 16:24:38 +02:00
CuraEngineBackend	Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings	2015-09-01 15:44:19 +02:00
GCodeWriter	Update all plugin metadata to specify API version	2015-07-31 17:07:33 +02:00
LayerView	Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings	2015-09-01 15:44:19 +02:00
RemovableDriveOutputDevice	Add proper translation contexts to RemovableDriveOutputDevice	2015-08-18 15:19:09 +02:00
SliceInfoPlugin	Added message asking about sending data to server	2015-08-27 13:24:37 +02:00
USBPrinting	Code style & switch to translation catalog	2015-08-27 16:04:02 +02:00