Merge branch 'openelec-pvr' of git://github.com/terratec/OpenELEC.tv into openelec-pvr

Conflicts:
	packages/addons/service/multimedia/Airplayer-Suite/source/default.py
This commit is contained in:
Stephan Raue 2011-09-02 17:35:26 +02:00
commit bc57cff42f

View File

@ -39,6 +39,7 @@ progress "setup XBMC"
cat > $HOME/.xbmc/userdata/advancedsettings.xml << EOF
<advancedsettings>
<useddsfanart>true</useddsfanart>
<splash>false</splash>
<cputempcommand>cputemp</cputempcommand>
<gputempcommand>gputemp</gputempcommand>
<samba>