resolved conflicts for 8062092a

Change-Id: Ibbe3d25e62b2c59b4dc89b198915869b61da6bf5
This commit is contained in:
Ed Heyl
2014-06-21 12:50:04 -07:00

View File

@@ -1,3 +1,5 @@
Pkg.Revision=10
Pkg.Revision=9
Archive.HostOs=WINDOWS
Archive.Os=WINDOWS
Archive.Arch=ANY
Extra.Path=usb_driver