Merge remote-tracking branch 'upstream/master'

This commit is contained in:
John Törnblom 2012-08-21 12:10:27 +02:00
commit 7b5cf6bfe6

View file

@ -395,6 +395,9 @@ main(int argc, char **argv)
channels_init();
epggrab_init();
epg_init();
access_init(createdefault);
tcp_server_init();
@ -415,9 +418,6 @@ main(int argc, char **argv)
capmt_init();
epggrab_init();
epg_init();
dvr_init();
htsp_init();