max_10 12d4b39a82 vuultimo4k added ...

Conflicts:
	acinclude.m4
	data/y-web/Y_Blocks.txt
	src/driver/nglcd.cpp
	src/gui/vfd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b6bf0b1991
Author: max_10 <max_10@gmx.de>
Date: 2019-09-11 (Wed, 11 Sep 2019)

Origin message was:
------------------
- vuultimo4k added

Conflicts:
	acinclude.m4
	data/y-web/Y_Blocks.txt
	src/driver/nglcd.cpp
	src/gui/vfd_setup.cpp
	src/neutrino.cpp


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

2019-09-12 21:07:20 +02:00

..

config

satellites.xml update

2019-01-24 15:19:35 +00: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

add icons

2019-06-26 21:27:30 +02:00

inetradio

data: unify and simplify Makefiles

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

initial

update initial settings

2019-08-10 22:19:34 +02: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

fix locale

2019-07-07 22:39:25 +02:00

pictures

Screensaver: try to fix background

2018-05-17 21:29:43 +02:00

policy

disable policy sample

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

scripts

backup.sh: add some more plugin configs

2019-05-25 01:02:22 +02:00

themes

data: unify and simplify Makefiles

2019-05-01 18:15:30 +02: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

vuultimo4k added

2019-09-12 21:07:20 +02: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