Jehan Monnier 6e97edcafd Merge remote branch 'bc/master' into tunnel ... Conflicts: .gitmodules Classes/LinphoneUI/LinphoneManager.m linphone.xcodeproj/project.pbxproj		2011-04-05 18:55:49 +02:00
..
msamr.mk	ad openamr build scripts	2011-04-04 14:56:37 +02:00
opencore-amr.mk	ad openamr build scripts	2011-04-04 14:56:37 +02:00
openssl.mk	add no-dso to openssl compil	2011-03-24 11:23:34 +01:00
tunnel.mk	implement tunnel	2011-03-17 12:36:25 +01:00