Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui

This commit is contained in:
Yann Diorcet 2012-09-20 18:44:04 +02:00
commit e3887217e9
2 changed files with 2 additions and 2 deletions

View file

@ -637,7 +637,7 @@ static LinphoneCoreVTable linphonec_vtable = {
linphone_core_set_root_ca(theLinphoneCore, lRootCa);
// Set audio assets
const char* lRing = [[LinphoneManager bundleFile:@"ring.wab"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
const char* lRing = [[LinphoneManager bundleFile:@"ring.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
linphone_core_set_ring(theLinphoneCore, lRing);
const char* lRingBack = [[LinphoneManager bundleFile:@"ringback.wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
linphone_core_set_ringback(theLinphoneCore, lRingBack);

@ -1 +1 @@
Subproject commit 972e9d009e1fe9dc3e2e1d672e39c98de0affa37
Subproject commit 3403f378bab82b67d569b029f466a2f1dee499bb