Merge branch 'v0.19.x'

2014-12-26 14:40:32 +01:00
parent d37811f177 163597ef69
commit 412bedb697
30 changed files with 147 additions and 52 deletions
--- a/src/input/plugins/MmsInputPlugin.cxx
+++ b/src/input/plugins/MmsInputPlugin.cxx
@@ -43,7 +43,7 @@ protected:
 	virtual size_t ThreadRead(void *ptr, size_t size,
 				  Error &error) override;

-	virtual void Close() {
+	void Close() override {
 		mmsx_close(mms);
 	}
 };