Rob Weber 9d7076da0c Merge branch 'master' into helix_google_drive ...

Conflicts:
	addon.xml
	resources/language/English/strings.xml
	resources/settings.xml

2015-02-13 09:42:26 -06:00

..

language

Merge branch 'master' into helix_google_drive

2015-02-13 09:42:26 -06:00

lib

folder should be Kodi Backup

2014-11-21 14:17:48 -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 'master' into helix_google_drive

2015-02-13 09:42:26 -06:00