Resolve merge conflicts master into devicesettings

This commit is contained in:
Paul Hollinsky
2018-09-26 18:24:59 -04:00
40 changed files with 142 additions and 123 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
#ifndef __DYNAMICLIB_DARWIN_H_
#define __DYNAMICLIB_DARWIN_H_
#define icsneo_dynamicLibraryLoad() dlopen("/home/paulywog/Code/icsneonext/build/libicsneoc.dylib", RTLD_LAZY)
#define icsneo_dynamicLibraryLoad() dlopen("/Users/paulywog/Code/icsneonext/build/libicsneoc.dylib", RTLD_LAZY)
#endif