Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development

This commit is contained in:
Matt Moening 2015-07-01 12:30:17 -07:00
commit 25265f01e2
2 changed files with 6 additions and 6 deletions

View file

@ -99,8 +99,8 @@ DefaultDestDir=12
%ramps.name%=DriverInstall, USB\VID_1A86&PID_7523
%ftdi.name%=DriverInstall, USB\VID_0403&PID_6001
%flashforge.name%=DriverInstall, USB\VID_23C1&PID_D314&REV_0001
%dremel.name%=DriverInstall, USB\VID_2A89&PID_8889&REV_0200
; %dremel.name%=DriverInstall, USB\VID_2A89&PID_8889
; %dremel.name%=DriverInstall, USB\VID_2A89&PID_8889&REV_0200
%dremel.name%=DriverInstall, USB\VID_2A89&PID_8889
[DeviceList.NTamd64]
%due.bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
@ -141,8 +141,8 @@ DefaultDestDir=12
%ramps.name%=DriverInstall, USB\VID_1A86&PID_7523
%ftdi.name%=DriverInstall, USB\VID_0403&PID_6001
%flashforge.name%=DriverInstall, USB\VID_23C1&PID_D314&REV_0001
%dremel.name%=DriverInstall, USB\VID_2A89&PID_8889&REV_0200
; %dremel.name%=DriverInstall, USB\VID_2A89&PID_8889
; %dremel.name%=DriverInstall, USB\VID_2A89&PID_8889&REV_0200
%dremel.name%=DriverInstall, USB\VID_2A89&PID_8889
[DeviceList.NTia64]
%esplora.bootloader.name%=DriverInstall, USB\VID_2341&PID_003C
@ -180,8 +180,8 @@ DefaultDestDir=12
%ramps.name%=DriverInstall, USB\VID_1A86&PID_7523
%ftdi.name%=DriverInstall, USB\VID_0403&PID_6001
%flashforge.name%=DriverInstall, USB\VID_23C1&PID_D314&REV_0001
%dremel.name%=DriverInstall, USB\VID_2A89&PID_8889&REV_0200
; %dremel.name%=DriverInstall, USB\VID_2A89&PID_8889
; %dremel.name%=DriverInstall, USB\VID_2A89&PID_8889&REV_0200
%dremel.name%=DriverInstall, USB\VID_2A89&PID_8889
[DriverInstall]
include=mdmcpq.inf,usb.inf