chiark / gitweb /
Merge branch 'new-settings' into devel
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 31 Jul 2015 20:24:23 +0000 (16:24 -0400)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 31 Jul 2015 20:24:23 +0000 (16:24 -0400)
commitcadb0433220d48bed695cd1f3e6f240186956635
tree2f25c3387dd41695a55379d3376290d99d130fc7
parent87c9667676e881277ddf64af323260d5eecc7a85
parent39e76cab17f7167f51023b42a03761f9b4eca9b7
Merge branch 'new-settings' into devel

Fixes T51
Cura/gui/sceneView.py
resources/quickprint/lulzbot_TAZ_5_05nozzle/ABS/High/profile.ini
resources/quickprint/lulzbot_TAZ_5_05nozzle/ABS/Low/profile.ini
resources/quickprint/lulzbot_TAZ_5_05nozzle/ABS/Normal/profile.ini
resources/quickprint/lulzbot_TAZ_5_05nozzle/HIPS/High/profile.ini
resources/quickprint/lulzbot_TAZ_5_05nozzle/HIPS/Low/profile.ini
resources/quickprint/lulzbot_TAZ_5_05nozzle/HIPS/Normal/profile.ini
resources/quickprint/lulzbot_TAZ_5_05nozzle/PLA/High/profile.ini
resources/quickprint/lulzbot_TAZ_5_05nozzle/PLA/Low/profile.ini
resources/quickprint/lulzbot_TAZ_5_05nozzle/PLA/Normal/profile.ini