Ernir Erlingsson 87635c7654 Merge branch '297-flickering-contacts' into 'master' ...

Fix flicker when loading contact list

Fixes #297.

See merge request !144

2016-04-18 08:57:54 +00:00

..

artwork

Replace bluetooth diagram PNG image with vector XML file.

2015-12-17 11:58:41 -02:00

assets

Upgrade Tor to 0.2.7.6. #166

2015-12-21 14:42:39 +00:00

libs

Replaced broken jsocks jar. #228

2016-01-21 11:28:54 +00:00

res

address issues found in final review

2016-04-12 17:04:52 -03:00

src

Merge branch '297-flickering-contacts' into 'master'

2016-04-18 08:57:54 +00:00

.gitignore

Added Gradle build files because Ant's too efficient for some people.

2014-11-25 14:54:34 +00:00

AndroidManifest.xml

UI for introducing two contacts to each other

2016-04-12 17:04:52 -03:00

build.gradle

Moved zxing dependency to briar-android.

2016-04-15 17:51:22 +01:00

proguard-rules.txt

Switched Roboguice/Guice out for Dagger 2

2016-03-14 21:01:21 +01:00

project.properties

tweaked proguard

2016-02-02 12:21:08 +01:00