sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-09-20 16:08:37 +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
device/plasion/include/neoviion.h
+1 -1
View File
@@ -25,6 +25,6 @@ public:
}
};
};
}
#endif
device/plasion/include/neoviplasma.h
+1 -1
View File
@@ -25,6 +25,6 @@ public:
}
};
};
}
#endif
device/plasion/include/plasion.h
+1 -1
View File
@@ -17,6 +17,6 @@ public:
}
};
};
}
#endif