sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 09:28:40 +02:00
Code Issues Projects Releases Wiki Activity

Resolve merge conflicts master into devicesettings

Browse Source
This commit is contained in:
Paul Hollinsky
2018-09-26 18:24:59 -04:00
parent a5b79167b9 4c45b235bc
commit 399c72e61d
40 changed files with 142 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/windows/include/ftdi.h
+1 -1
View File
@@ -11,6 +11,6 @@ public:
static std::vector<neodevice_t> FindByProduct(int product) { return VCP::FindByProduct(product, L"serenum"); }
};
};
}
#endif
platform/windows/include/pcap.h
+1 -1
View File
@@ -65,6 +65,6 @@ private:
};
};
};
}
#endif
platform/windows/include/registry.h
+1 -1
View File
@@ -28,6 +28,6 @@ private:
};
};
};
}
#endif
platform/windows/include/stm32.h
+1 -1
View File
@@ -11,6 +11,6 @@ public:
static std::vector<neodevice_t> FindByProduct(int product) { return VCP::FindByProduct(product, L"usbser"); }
};
};
}
#endif
platform/windows/include/vcp.h
+1 -1
View File
@@ -43,6 +43,6 @@ private:
void writeTask();
};
};
}
#endif