Merge remote-tracking branch 'tuxbox/master'

Origin commit data
------------------
Branch: ni/coolstream
Commit: 48ff7b36a2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2017-01-30 21:36:09 +01:00
23 changed files with 122 additions and 77 deletions

View File

@@ -21,7 +21,7 @@ update_file()
fi
echo "update $FILE_IMAGE"
rm -f $FILE_IMAGE
cp $FILE_NEW $FILE_IMAGE
cp -d $FILE_NEW $FILE_IMAGE
fi
}