sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +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
api/icsneocpp/include/icsneocpp.h
+4 -2
View File
@@ -7,7 +7,9 @@
#include "device/include/device.h"
namespace icsneo {
std::vector<std::shared_ptr<Device>> FindAllDevices();
};
std::vector<std::shared_ptr<Device>> FindAllDevices();
}
#endif