Wrong branch stuff got in by accident

2014-11-13 20:06:43 +02:00
parent 53dd1e4257
commit 002d2cb2ff
1 changed files with 0 additions and 2 deletions
--- a/include/basic_filters.h
+++ b/include/basic_filters.h
@@ -43,7 +43,6 @@
 #include "templates.h"
 #include "lmms_constants.h"
 #include "interpolation.h"
-#include "MemoryManager.h"

 //#include <iostream>
 //#include <cstdlib>
@@ -51,7 +50,6 @@
 template<ch_cnt_t CHANNELS/* = DEFAULT_CHANNELS*/>
 class basicFilters
 {
-	MM_OPERATORS
 public:
 	enum FilterTypes
 	{