merging

2018-11-09 13:00:43 +01:00
parent c5867acd52
commit 8eb1f724ea
21 changed files with 206 additions and 63 deletions
--- a/FlippR-Driver/src/output/ILamp.h
+++ b/FlippR-Driver/src/output/ILamp.h
@@ -8,12 +8,14 @@
 #ifndef _SRC_OUTPUT_ILAMP_H_
 #define _SRC_OUTPUT_ILAMP_H_

+#include "IOutputItem.h"
+
 namespace FlippR_Driver
 {
 namespace output
 {

-class ILamp
+class ILamp : public IOutputItem
 {

 };