Daniel Martí 5bb5e3a96b Fix conflict between swap and privileged merges ...

Also avoid possible NPE in the package name comparison.

2015-09-09 21:35:38 -07:00

..

assets

…

libs/binaryDeps

Remove support for building entirely from source

2015-09-08 15:40:44 -07:00

res

Merge branch 'enhanced-priv-install' of https://gitlab.com/dschuermann/fdroidclient

2015-09-09 21:21:06 -07:00

src

Fix conflict between swap and privileged merges

2015-09-09 21:35:38 -07:00

test

Unify and deduplicate gitignores

2015-09-09 21:24:36 -07:00

tools

Merge branch 'new-swap'

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

AndroidManifest.xml

Merge branch 'enhanced-priv-install' of https://gitlab.com/dschuermann/fdroidclient

2015-09-09 21:21:06 -07:00

build.gradle

Merge branch 'enhanced-priv-install' of https://gitlab.com/dschuermann/fdroidclient

2015-09-09 21:21:06 -07:00

proguard-rules.pro

use NetCipher to get improved TLS and cipher support on HTTPS connections

2015-09-08 19:19:30 +02:00