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

This commit is contained in:
Stephan Raue 2013-08-17 16:16:34 +02:00
commit fa759e4bc4
19 changed files with 7 additions and 2 deletions

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc-theme-Confluence" PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="12.2-41ba7b9" PKG_VERSION="12.2-7da5ea4"
if [ "$XBMC" = "master" ]; then if [ "$XBMC" = "master" ]; then
PKG_VERSION="13.alpha-df91888" PKG_VERSION="13.alpha-df91888"
elif [ "$XBMC" = "xbmc-aml" ]; then elif [ "$XBMC" = "xbmc-aml" ]; then

View File

@ -19,5 +19,6 @@
</samba> </samba>
<network> <network>
<curlclienttimeout>30</curlclienttimeout> <curlclienttimeout>30</curlclienttimeout>
<readBufferFactor>4.0</readBufferFactor>
</network> </network>
</advancedsettings> </advancedsettings>

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc" PKG_NAME="xbmc"
PKG_VERSION="12.2-41ba7b9" PKG_VERSION="12.2-7da5ea4"
if [ "$XBMC" = "master" ]; then if [ "$XBMC" = "master" ]; then
PKG_VERSION="13.alpha-df91888" PKG_VERSION="13.alpha-df91888"
elif [ "$XBMC" = "xbmc-aml" ]; then elif [ "$XBMC" = "xbmc-aml" ]; then

View File

@ -19,6 +19,7 @@
</samba> </samba>
<network> <network>
<curlclienttimeout>30</curlclienttimeout> <curlclienttimeout>30</curlclienttimeout>
<readBufferFactor>4.0</readBufferFactor>
</network> </network>
<!-- audio workaround for fusion --> <!-- audio workaround for fusion -->
<audiooutput> <audiooutput>

View File

@ -21,6 +21,7 @@
</samba> </samba>
<network> <network>
<curlclienttimeout>30</curlclienttimeout> <curlclienttimeout>30</curlclienttimeout>
<readBufferFactor>4.0</readBufferFactor>
</network> </network>
<!-- audio workaround for ATV --> <!-- audio workaround for ATV -->
<audiooutput> <audiooutput>

View File

@ -19,6 +19,7 @@
</samba> </samba>
<network> <network>
<curlclienttimeout>30</curlclienttimeout> <curlclienttimeout>30</curlclienttimeout>
<readBufferFactor>4.0</readBufferFactor>
</network> </network>
<!-- audio workaround for fusion --> <!-- audio workaround for fusion -->
<audiooutput> <audiooutput>

View File

@ -29,6 +29,7 @@
<network> <network>
<curlclienttimeout>30</curlclienttimeout> <curlclienttimeout>30</curlclienttimeout>
<readBufferFactor>4.0</readBufferFactor>
</network> </network>
</advancedsettings> </advancedsettings>