]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34a0b4e cc90b96)
Merge branch 'master' of git.linphone.org:linphone-android
authorGuillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Thu, 24 Nov 2011 10:22:07 +0000 (11:22 +0100)
committerGuillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Thu, 24 Nov 2011 10:22:07 +0000 (11:22 +0100)
Conflicts:
src/org/linphone/IncallActivity.java
src/org/linphone/LinphoneActivity.java
src/org/linphone/LinphonePreferencesActivity.java
submodules/linphone
test/org/linphone/TestConferenceActivity.java


Trivial 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