Merge branch 'dropbox'

Conflicts:
	addon.xml
	changelog.txt
	resources/lib/backup.py
	resources/settings.xml
This commit is contained in:
Rob Weber
2012-11-28 09:33:47 -06:00
17 changed files with 2251 additions and 67 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<settings>
<category id="general" label="30011">
<setting id="remote_selection" type="enum" lvalues="30018|30019" default="0" label="30025"/>
<setting id="remote_selection" type="enum" lvalues="30018|30019|30027" default="0" label="30025"/>
<setting id="remote_path_2" type="text" label="30024" default="" visible="eq(-1,1)" />
<setting id="remote_path" type="folder" label="30020" visible="eq(-2,0)" />
<setting id="backup_rotation" type="number" label="30026" default="0" />