Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'newUI' of git.linphone.org:linphone-android into newUI

Browse source
This commit is contained in:
Sylvain Berfini 2012-08-03 17:49:20 +02:00
commit 43005d088f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -3,7 +3,7 @@ SDK_PATH=$(shell dirname `which android`)
NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo || echo "4" )
TOPDIR=$(shell pwd)
PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon)
LINPHONE_VERSION=$(shell cat submodules/linphone/configure.ac | grep -m 1 "LINPHONE_VERSION=" | sed -e 's/LINPHONE_VERSION=//')
LINPHONE_VERSION=$(shell grep -e '^.C_INIT(' submodules/linphone/configure.ac | sed -e 's/.*linphone]\,\[//' |sed -e 's/\].*//' )
KEYSTORE=bc-android.keystore
KEYALIAS=nw8000

2
submodules/linphone

@ -1 +1 @@
Subproject commit 5f2640d57a48e122cb14ffa2df23304103e3d6a9
Subproject commit a58b548331c103bca50b33898b07e13f5745b1c4