1
0
mirror of https://github.com/rofafor/vdr-plugin-satip.git synced 2023-10-10 11:37:42 +00:00

Merge commit '2f723e0' into datathread

Conflicts:
	Makefile
	tuner.c
	tuner.h
This commit is contained in:
nafets227
2014-11-09 21:19:20 +01:00
7 changed files with 424 additions and 331 deletions

View File

@@ -89,7 +89,8 @@ all-redirect: all
### The object files (add further files here):
OBJS = $(PLUGIN).o common.o config.o data.o device.o discover.o param.o \
sectionfilter.o server.o setup.o socket.o statistics.o tuner.o
rtsp.o sectionfilter.o server.o setup.o socket.o statistics.o \
tuner.o
### The main target: