mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 08:51:04 +02:00
Conflicts:
data/Makefile.am
data/scripts/backup.sh
src/neutrino.cpp
src/zapit/include/zapit/zapit.h
Signed-off-by: Thilo Graf <dbt@novatux.de>
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3fd544737a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
Origin message was:
------------------
- add webradio; first steps
Conflicts:
data/Makefile.am
data/scripts/backup.sh
src/neutrino.cpp
src/zapit/include/zapit/zapit.h
Signed-off-by: Thilo Graf <dbt@novatux.de>
------------------
This commit was generated by Migit