BPanther ba4b2c60dd vuplus: relevant pids routing ...

Conflicts:
	src/neutrino.cpp
	src/system/settings.h
	src/zapit/include/zapit/zapit.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b5d99819b
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2020-01-18 (Sat, 18 Jan 2020)



------------------
This commit was generated by Migit

2020-01-18 11:36:58 +01:00

..

config

data/config/bad_package_pattern.list.sample: add more entries

2020-01-09 21:37:16 +01:00

control

data: unify and simplify Makefiles

2019-05-01 18:15:30 +02:00

fonts

fonts: add ubuntu-font-licence-1.0

2019-05-13 22:47:04 +02:00

icons

radiotext: add icon to new radiotext window

2020-01-06 23:46:24 +01:00

inetradio

data: unify and simplify Makefiles

2019-05-01 18:15:30 +02:00

initial

initial-settings: update

2020-01-01 19:39:08 +01:00

iso-codes

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

2017-12-07 12:17:23 +01:00

lcd

…

license

…

locale

vuplus: relevant pids routing

2020-01-18 11:36:58 +01:00

pictures

data/pictures: disable new logo.jpg; not really usefull for narrow-breasted boxes like hd1

2019-12-29 23:06:12 +01:00

policy

disable policy sample

2019-01-01 23:01:28 +01:00

scripts

allow /var/etc/fstab and /var/etc/autofs.* only for netfs setup

2019-12-12 22:51:48 +01:00

themes

themes: align some alpha and color values

2020-01-06 22:25:46 +01:00

webradio

remove unnecessary install-data-hooks

2018-11-22 00:00:28 +01:00

webtv

remove unnecessary install-data-hooks

2018-11-22 00:00:28 +01:00

y-web

yWeb: fix some links to us

2019-12-13 23:03:24 +01:00

zapit

data: move zapit data to new zapit subdir

2018-12-16 01:17:01 +01:00

Makefile.am

move control scripts from data/neutrino-scripts to data/control

2019-01-26 17:05:43 +01:00