Daniel Martí 6214b7f659 Merge branch 'issue-395'

2015-09-05 22:16:15 -04:00

..

assets

…

libs

…

res

Merge branch 'issue-395'

2015-09-05 22:16:15 -04:00

src

Merge branch 'issue-395'

2015-09-05 22:16:15 -04:00

test

Update RepoXMLHandlerTest to make tests pass

2015-09-03 18:02:57 -07:00

tools

Merge branch 'new-swap'

2015-09-06 08:37:26 +10:00

AndroidManifest.xml

Merge branch 'new-swap'

2015-09-06 08:37:26 +10:00

build.gradle

Update zxing-core to 3.2.1

2015-09-05 22:14:18 -04:00

proguard-rules.pro

Use a more generic comment on -keep proguard rules

2015-08-29 21:42:50 -07:00