Joe Bowser 6cf6e20d2e Merge branch 'master' into StudioProjectCompat, fixing conflicts, need ...

to re-add previous PR fix on the branch

2017-10-18 11:04:44 -07:00

..

app

This is probably a bad idea, but we need to split the gradle files into legacy and new style

2017-06-14 09:57:28 -07:00

assets/www

CB-12895: Temporarily disabling eslint since cordova-js does not have eslint yet.

2017-09-25 14:00:38 -07:00

legacy

OK, Going back to the old build.gradle for legacy projects

2017-06-14 09:57:29 -07:00

res

updated xxhdpi mipmap icon to 144x144

2016-10-28 21:57:54 -07:00

Activity.java

Fix tab/space issue

2016-10-12 22:21:14 -04:00

AndroidManifest.xml

CB-8722 - Move icons from drawable to mipmap

2016-10-11 13:29:15 -07:00

build.gradle

Merge branch 'master' into StudioProjectCompat, fixing conflicts, need

2017-10-18 11:04:44 -07:00

gitignore

CB-7726 fix typo in gitignore: ant-built -> ant-build

2014-10-27 12:33:09 -04:00

project.properties

Changing the project to add the app directory as a dependency

2017-06-14 09:57:27 -07:00

wrapper.gradle

CB-12524: Put the script in the wrong spot, oops

2017-03-13 13:51:37 -07:00