Joe Bowser 43956c1bc8 Merge branch 'master' into StudioProjectCompat ...

Fixing conflict caused by merging #417 into master

2017-11-20 18:21:49 -08:00

..

app

Merge branch 'master' into StudioProjectCompat

2017-11-20 18:21:49 -08:00

assets/www

Update JS snapshot to version 6.5.0-dev (via coho)

2017-11-06 11:44:23 -08: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

CB-13580: fix build for multiple apks (different product flavors)

2017-11-16 01:27:20 +01: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