akwizgran 5b05424d83 Merge branch 'master' into '941-store-correct-parent-id' ...

# Conflicts:
#   briar-core/src/test/java/org/briarproject/briar/blog/BlogManagerImplTest.java

2017-05-12 09:34:24 +00:00

..

src/main/java/org/briarproject/briar/api

Merge branch 'master' into '941-store-correct-parent-id'

2017-05-12 09:34:24 +00:00

.gitignore

Use Java 1.6 instead of 1.5. We no longer aim to support OS X 10.4.

2013-11-22 12:00:00 +00:00

build.gradle

Updated java.library.path.

2016-11-30 18:10:49 +00:00