From: Michael McMaster <michael@codesrc.com>
Date: Fri, 28 Nov 2014 13:47:49 +0000 (+0000)
Subject: Merge  scsi2sd-util GUI changes
X-Git-Tag: v4.00.00^2~2
X-Git-Url: http://git.codesrc.com/gitweb.cgi?a=commitdiff_plain;h=2354021f553ebd1530f3a34655974e32e272bc56;p=SCSI2SD.git

Merge  scsi2sd-util GUI changes

Conflicts:
	software/SCSI2SD/src/config.c
	software/SCSI2SD/src/disk.c
	software/SCSI2SD/src/scsi.c
	software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter.h
	software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.c
	software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfittergnu.inc
	software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitteriar.inc
	software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitterrv.inc
	software/SCSI2SD/v3/SCSI2SD.cydsn/Generated_Source/PSoC5/project.h
	software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cycdx
	software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyfit
	software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.cyprj
	software/SCSI2SD/v3/SCSI2SD.cydsn/SCSI2SD.svd
	software/SCSI2SD/v3/SCSI2SD.cydsn/TopDesign/TopDesign.cysch
	software/SCSI2SD/v3/SCSI2SD.cydsn/scsiTarget/scsiTarget.v
	software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter.h
	software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitter_cfg.c
	software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfittergnu.inc
	software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitteriar.inc
	software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/cyfitterrv.inc
	software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoC5/project.h
	software/SCSI2SD/v4/SCSI2SD.cydsn/Generated_Source/PSoCCreatorExportIDE.xml
	software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cycdx
	software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyfit
	software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.cyprj
	software/SCSI2SD/v4/SCSI2SD.cydsn/SCSI2SD.svd
	software/SCSI2SD/v4/SCSI2SD.cydsn/TopDesign/TopDesign.cysch
---

2354021f553ebd1530f3a34655974e32e272bc56