Merge remote-tracking branch 'upstream/master' into openelec-systemd

This commit is contained in:
Stefan Saraev 2013-09-11 20:40:06 +03:00
commit 75596d2d30
10 changed files with 2 additions and 2 deletions

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="12.2-58a9d9e"
PKG_VERSION="12.2-c2d3aeb"
if [ "$XBMC" = "master" ]; then
PKG_VERSION="13.alpha-2ef8929"
elif [ "$XBMC" = "xbmc-aml" ]; then

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="12.2-58a9d9e"
PKG_VERSION="12.2-c2d3aeb"
if [ "$XBMC" = "master" ]; then
PKG_VERSION="13.alpha-2ef8929"
elif [ "$XBMC" = "xbmc-aml" ]; then