Merge branch 'openelec-settings' of github.com:OpenELEC/OpenELEC.tv into openelec-settings

Conflicts:
	packages/sysutils/busybox/install
This commit is contained in:
Stephan Raue 2013-01-30 06:30:05 +01:00
commit d1e7cd626f

View File

@ -71,4 +71,3 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`"
mkdir -p $INSTALL/usr/www/error
echo "404" > $INSTALL/usr/www/error/404.html