Merge branch 'master' into helix_google_drive

Conflicts:
	addon.xml
	resources/language/English/strings.xml
	resources/settings.xml
This commit is contained in:
Rob Weber
2015-02-13 09:42:26 -06:00
5 changed files with 26 additions and 3 deletions

View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.xbmcbackup"
name="Backup" version="1.0.0" provider-name="robweber">
name="Backup" version="1.0.3" provider-name="robweber">
<requires>
<import addon="xbmc.python" version="2.14.0"/>
<import addon="xbmc.python" version="2.19.0"/>
<import addon="script.module.httplib2" version="0.8.0" optional="true"/>
<import addon="script.module.oauth2client" version="1.3.2" optional="true"/>
<import addon="script.module.uritemplate" version="0.6" optional="true"/>