Merge branch 'master' into google_drive

Conflicts:
	resources/language/English/strings.xml
	resources/lib/backup.py
This commit is contained in:
Rob Weber
2014-11-05 08:40:07 -06:00
6 changed files with 164 additions and 11 deletions

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.xbmcbackup"
name="XBMC Backup" version="0.5.8.5" provider-name="robweber">
name="XBMC Backup" version="0.5.8.7" provider-name="robweber">
<requires>
<import addon="xbmc.python" version="2.14.0"/>
<import addon="script.module.googleapi" version="0.0.1" />