Merge branch 'master' into helix_google_drive

Conflicts:
	resources/language/English/strings.xml
This commit is contained in:
Rob Weber
2015-04-24 09:28:05 -05:00
5 changed files with 17 additions and 5 deletions

View File

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