mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-20 06:54:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/external-keychain

Browse Source 
# Conflicts:
#	main/pom.xml
#	main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
This commit is contained in:
Sebastian Stenzel
2016-08-30 19:22:45 +02:00
parent 72e52df4e0 995bba616f
commit 902b29ee0a
46 changed files with 521 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/pom.xml
+7 -1
View File
@@ -27,6 +27,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- dependency versions -->
<cryptomator.cryptolib.version>1.0.0-SNAPSHOT</cryptomator.cryptolib.version>
<cryptomator.jni.version>1.0.0-SNAPSHOT</cryptomator.jni.version>
<log4j.version>2.1</log4j.version>
<slf4j.version>1.7.7</slf4j.version>
@@ -124,7 +125,12 @@
<version>${project.version}</version>
</dependency>
<!-- Cryptomator libraries -->
<!-- Cryptomator Libs -->
<dependency>
<groupId>org.cryptomator</groupId>
<artifactId>cryptolib</artifactId>
<version>${cryptomator.cryptolib.version}</version>
</dependency>
<dependency>
<groupId>org.cryptomator</groupId>
<artifactId>jni</artifactId>