Rob Weber 4ff0e49d82 Merge branch 'dropbox' ...

Conflicts:
	addon.xml
	changelog.txt
	resources/lib/backup.py
	resources/settings.xml

2012-11-28 09:33:47 -06:00

..

language

Merge branch 'dropbox'

2012-11-28 09:33:47 -06:00

lib

modified backup class to display more info

2012-11-28 08:56:58 -06:00

__init__.py

restored __init__.py files

2012-10-22 13:53:01 -05:00

.gitignore

restored __init__.py files

2012-10-22 13:53:01 -05:00

settings.xml

Merge branch 'dropbox'

2012-11-28 09:33:47 -06:00