mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 08:21:12 +02:00
Conflicts: data/icons/buttons/orphaned/0-green.png data/icons/buttons/orphaned/0-red.png data/icons/buttons/orphaned/1-green.png data/icons/buttons/orphaned/1-red.png data/icons/buttons/orphaned/2-green.png data/icons/buttons/orphaned/2-red.png data/icons/buttons/orphaned/3-green.png data/icons/buttons/orphaned/3-red.png data/icons/buttons/orphaned/4-green.png data/icons/buttons/orphaned/4-red.png data/icons/buttons/orphaned/5-green.png data/icons/buttons/orphaned/5-red.png data/icons/buttons/orphaned/6-green.png data/icons/buttons/orphaned/6-red.png data/icons/buttons/orphaned/7-green.png data/icons/buttons/orphaned/7-red.png data/icons/buttons/orphaned/8-green.png data/icons/buttons/orphaned/8-red.png data/icons/buttons/orphaned/9-green.png data/icons/buttons/orphaned/9-red.png data/icons/buttons/orphaned/longpress.png data/icons/hints/hint_rass.png data/icons/hints/hint_spark.png data/icons/various/rass.png Signed-off-by: Thilo Graf <dbt@novatux.de>