]> sjero.net Git - linphone/commit
Merge commit 'c519c4a'
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Thu, 31 Mar 2011 08:58:35 +0000 (10:58 +0200)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Thu, 31 Mar 2011 08:58:35 +0000 (10:58 +0200)
commitecca92fc21b379fe227980f4a21dc759b7aca260
tree675b4d6e8751e2590e6373a5c3f08e8c97281789
parent288b818ab2f7bab58e3b3e2d6a53064d34fa020c
parentc519c4a6675d137a59f8d8eceb8055ccfc36f351
Merge commit 'c519c4a'

Conflicts:
build/android/Android.mk
build/android/Android.mk