]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5304e69 3e8f953)
Merge branch 'master' of git://git.savannah.nongnu.org/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Tue, 20 Jul 2010 15:03:25 +0000 (17:03 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Tue, 20 Jul 2010 15:03:25 +0000 (17:03 +0200)
1  2 
build/android/Android.mk patch | diff1 | diff2 | blob | history

diff --cc build/android/Android.mk
Simple merge
Linphone VOIP client (https://www.linphone.org/) with ongoing modifications to enable DCCP support for the Masters Thesis of Samuel Jero <sj323707@ohio.edu>. Clone using: git clone http://sjero.net/src/linphone/ linphone