Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

OpenELEC · Nov 20, 2013 · 24ee98c · 24ee98c
2 parents 1213c6e + b5c120e
commit 24ee98c
Show file tree

Hide file tree

Showing 8 changed files with 188 additions and 321 deletions.
diff --git a/packages/mediacenter/xbmc-addon-xvdr/meta b/packages/mediacenter/xbmc-addon-xvdr/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-addon-xvdr"
-PKG_VERSION="6c95579"
+PKG_VERSION="f267086"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-bump-xbmc.gui.patch b/packages/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-bump-xbmc.gui.patch
diff --git a/...s/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-fix-scrambled-hd-channel-scan.patch b/...s/mediacenter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-fix-scrambled-hd-channel-scan.patch
diff --git a/...enter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-sync-with-xbmc.-bump-pvr-api-to-1.9.0.patch b/...enter/xbmc-addon-xvdr/patches/xbmc-addon-xvdr-sync-with-xbmc.-bump-pvr-api-to-1.9.0.patch
diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="13.alpha-f8b0614"
+PKG_VERSION="13.alpha-cca24dd"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="13.alpha-f8b0614"
+PKG_VERSION="13.alpha-cca24dd"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"