Rob Weber f0cce73851 Merge branch 'master' into helix_google_drive ...

Conflicts:
	resources/language/English/strings.xml

2015-04-24 09:28:05 -05:00

..

language

exit if we can't delete the old archive

2015-03-26 10:38:51 -05:00

lib

Merge branch 'master' into helix_google_drive

2015-04-24 09:28:05 -05: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

mixed up string ids

2015-02-13 09:50:07 -06:00