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

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ace56d488
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)



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

2017-01-29 21:30:01 +01:00

..

backup_flash.sh

NI \o/

2016-05-19 22:59:54 +02:00

backup.sh

data/scripts/backup.sh: don't use $(hostname) in $DATE variable

2016-06-01 21:03:25 +02:00

install.sh

install.sh: Preserve symlinks at update

2017-01-29 04:31:12 +01:00

Makefile.am

NI \o/

2016-05-19 22:59:54 +02:00

restore_flash.sh

NI \o/

2016-05-19 22:59:54 +02:00

restore.sh

NI \o/

2016-05-19 22:59:54 +02:00

wakeup.sh

NI \o/

2016-05-19 22:59:54 +02:00