Merge remote-tracking branch 'dweismueller/vdr_vnsiserver5_new' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 31 May 2014 10:29:22 +0000 (12:29 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 31 May 2014 10:29:22 +0000 (12:29 +0200)
Conflicts:
make.sh

1  2 
make.sh

diff --cc make.sh
+++ b/make.sh
@@@ -683,6 -676,6 +683,7 @@@ buildipfire() 
    ipfiremake ffmpeg
    ipfiremake vdr
    ipfiremake vdr_streamdev
++  ipfiremake vdr_vnsiserver5
    ipfiremake vdr_vnsiserver3
    ipfiremake vdr_epgsearch
    ipfiremake vdr_dvbapi