Merge remote-tracking branch 'origin/pr/365'

diff --cc Makefile
Simple merge

diff --cc src/idnode.c
Simple merge

diff --cc src/idnode.h
Simple merge

diff --cc src/input/mpegts/linuxdvb/linuxdvb_adapter.c
Simple merge

diff --cc src/input/mpegts/scanfile.c
index 9f23c0b8684bdb2bfa9274ff4490968c618d6ad7,f1fdf7cacf5f2f3f797c03abb29fffd287cbbc07..bf540557c537e76ede76866a09e07ee776db8527
--- 1/src/input/mpegts/linuxdvb/scanfile.c
--- 2/src/input/mpegts/scanfile.c
+++ b/src/input/mpegts/scanfile.c
@@@ -17,9 -17,9 +17,9 @@@
   */
  
  #include "tvheadend.h"
- #include "../dvb.h"
+ #include "dvb.h"
  #include "filebundle.h"
 -#include "config2.h"
 +#include "config.h"
  #include "scanfile.h"
  
  #include <sys/types.h>

diff --cc src/main.c
Simple merge

diff --cc src/webui/webui.c
Simple merge