From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 31 May 2014 10:29:22 +0000 (+0200)
Subject: Merge remote-tracking branch 'dweismueller/vdr_vnsiserver5_new' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=1d39d23dfa08e8eb194e0e3fa7b7254d02b89212

Merge remote-tracking branch 'dweismueller/vdr_vnsiserver5_new' into next

Conflicts:
	make.sh
---

1d39d23dfa08e8eb194e0e3fa7b7254d02b89212
diff --cc make.sh
index 4450800d0,4f40b4603..83d73957f
--- a/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