Updating development with upstream changes #2

Closed
muellerr wants to merge 38 commits from mueller/master into development
1 changed files with 2 additions and 1 deletions
Showing only changes of commit d268c6d96c - Show all commits

View File

@ -3,11 +3,12 @@
#include "OBSWVersion.h"
#ifdef __cplusplus
#include "objects/systemObjectList.h"
#include "events/subsystemIdRanges.h"
#include "returnvalues/classIds.h"
#ifdef __cplusplus
namespace config {
#endif