diff options
| author | Ghostkeeper <ghost_keeper+github@hotmail.com> | 2016-03-17 17:24:00 +0300 |
|---|---|---|
| committer | Ghostkeeper <ghost_keeper+github@hotmail.com> | 2016-03-17 17:24:00 +0300 |
| commit | de9a66e1f41a849990b148c7a33515f972b39749 (patch) | |
| tree | 6063c46e88e081259f72c7fb26286b3fc8131da7 /README.md | |
| parent | 14f5d236b20df71438c31a20f932a75c0a955df7 (diff) | |
| parent | 479c6c3319151c79725472874880ba2c5f6612ae (diff) | |
Merge branch '2.1'
Conflicts:
plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
plugins/USBPrinting/PrinterConnection.py
resources/machines/fdmprinter.json
resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions