Skip to content
Snippets Groups Projects
Commit 2a1509f1 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Merge branch 'master' of git.savoirfairelinux.com:sflphone-android 

Conflicts:
	jni/sflphone
parents 5d8347a9 bd6f5f2a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
jni/Application.mk
+ 1
− 0
View file @ 2a1509f1
......@@ -17,6 +17,7 @@ APP_MODULES += dbus-send
APP_MODULES += libdbus-c++-1
APP_MODULES += libdbus-glue
APP_MODULES += libsiplink
APP_MODULES += libconfig
#APP_MODULES += libcrypto
#APP_MODULES += libssl
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment