1
0
mirror of https://github.com/preble/libpinproc synced 2026-02-24 18:25:23 +01:00

resolved merge conflicts

This commit is contained in:
gstellenberg
2009-05-22 22:36:20 -05:00
11 changed files with 254 additions and 50 deletions

View File

@@ -56,6 +56,7 @@ protected:
public:
// public libpinproc API:
PRResult LoadDefaultsFromYAML(const char *yamlFilePath);
int GetEvents(PREvent *events, int maxEvents);
PRResult DriverUpdateGlobalConfig(PRDriverGlobalConfig *driverGlobalConfig);