]> sjero.net Git - linphone/commit
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)
commite261dcc2072fcee892805c223d0fdd63ed27e069
tree1ea5e4c5054fb642f1783660042764d72eee64cb
parent34a0b4eb5e8aa963fdac5d47ffebed764b18a36a
parentcc90b960f10487b3f39ddcce290699681dcd77eb
Merge branch 'master' of git.linphone.org:linphone-android

Conflicts:
src/org/linphone/IncallActivity.java
src/org/linphone/LinphoneActivity.java
src/org/linphone/LinphonePreferencesActivity.java
submodules/linphone
test/org/linphone/TestConferenceActivity.java