Resolve merge conflicts master into devicesettings

device/include/device.h

@@ -78,6 +78,6 @@ private:
 	void enforcePollingMessageLimit();
 };
 
-};
+}
 
 #endif

device/include/devicefinder.h

@@ -12,6 +12,6 @@ public:
 	static std::vector<std::shared_ptr<Device>> FindAll();
 };
 
-};
+}
 
 #endif

device/include/neodevice.h

@@ -6,8 +6,10 @@
 #ifdef __cplusplus
 // A forward declaration is needed as there is a circular dependency
 namespace icsneo {
-	class Device;
-};
+
+class Device;
+
+}
 typedef icsneo::Device* devicehandle_t;
 #else
 typedef void* devicehandle_t;

device/neoobd2pro/include/neoobd2pro.h

@@ -30,6 +30,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/neoobd2sim/include/neoobd2sim.h

@@ -30,6 +30,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/neovifire/include/neovifire.h

@@ -53,6 +53,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/neovifire2/include/neovifire2.h

@@ -14,6 +14,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/neovifire2/include/neovifire2eth.h

@@ -40,6 +40,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/neovifire2/include/neovifire2usb.h

@@ -29,6 +29,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/plasion/include/neoviion.h

@@ -25,6 +25,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/plasion/include/neoviplasma.h

@@ -25,6 +25,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/plasion/include/plasion.h

@@ -17,6 +17,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/radgalaxy/include/radgalaxy.h

@@ -44,6 +44,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/radstar2/include/radstar2.h

@@ -30,6 +30,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/radsupermoon/include/radsupermoon.h

@@ -33,6 +33,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/valuecan3/include/valuecan3.h

@@ -29,6 +29,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/valuecan4/include/valuecan4.h

@@ -30,6 +30,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif

device/vividcan/include/vividcan.h

@@ -32,6 +32,6 @@ public:
 	}
 };
 
-};
+}
 
 #endif