Merge branches 'cpp-btree' and 'progsig-sx' into jgrpp

src/3rdparty/cpp-btree/btree.h

@@ -100,7 +100,6 @@
 #ifndef UTIL_BTREE_BTREE_H__
 #define UTIL_BTREE_BTREE_H__
 
-#include <assert.h>
 #include <stddef.h>
 #include <string.h>
 #include <sys/types.h>

src/programmable_signals.cpp

@@ -17,7 +17,6 @@
 #include "window_func.h"
 #include "company_func.h"
 #include "cmd_helper.h"
-#include <assert.h>
 
 ProgramList _signal_programs;