mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 09:21:09 +02:00
5b8e0f426e
Conflicts:
src/gui/user_menue_setup.cpp
src/system/settings.h
Signed-off-by: Thilo Graf <dbt@novatux.de>
Origin commit data
------------------
Branch: ni/coolstream
Commit: fb2d6f95e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)
Origin message was:
------------------
- user-menu: add audio fileplay item
Conflicts:
src/gui/user_menue_setup.cpp
src/system/settings.h
Signed-off-by: Thilo Graf <dbt@novatux.de>
------------------
This commit was generated by Migit
Neutrino-HD ツ