]> sjero.net Git - linphone/commit
Merge branch 'master' of git.linphone.org:linphone-android into conferencing
authorGuillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Thu, 13 Oct 2011 13:25:17 +0000 (15:25 +0200)
committerGuillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Thu, 13 Oct 2011 13:57:22 +0000 (15:57 +0200)
commit02851b26f7f30bcfe94476b1e38e9519d9108cfd
tree9a76d5dd27723d29cb956f37b30f58867b666730
parent382b6f480a1286aab7711a3f767321c186c57b66
parent641354c50f65f6dbb94d7888fb3ae0c65ae066fc
Merge branch 'master' of git.linphone.org:linphone-android into conferencing

Conflicts:
src/org/linphone/LinphoneManager.java
src/org/linphone/core/LinphoneCallParamsImpl.java
src/org/linphone/core/LinphoneCoreImpl.java
submodules/linphone
LinphoneCallParamsImpl.java
LinphoneCoreImpl.java