Simon Morlat b838ecebd3 Merge branch 'master' into tunnel ... and fix srtp compilation (arch not set in archives). Conflicts: Classes/LinphoneUI/LinphoneManager.m linphone.xcodeproj/project.pbxproj		2011-10-26 23:01:19 +02:00
..
msamr.mk	fix veryclean for msamr	2011-06-17 10:18:08 +02:00
opencore-amr.mk	fix bad tab in makefile !	2011-08-17 22:14:03 +02:00
openssl.mk	fix for IOS 5	2011-10-14 18:03:40 +02:00
openssl.patch	Patches for srtp and zrtp.	2011-09-06 14:51:14 +02:00
silk.mk	fix for silk	2011-10-21 23:11:29 +02:00
srtp.mk	Srtp version from 1.4.2 to 1.4.4.	2011-09-09 14:20:33 +02:00
srtp.patch	Srtp version from 1.4.2 to 1.4.4.	2011-09-09 14:20:33 +02:00
tunnel.mk	Merge remote-tracking branch 'bc/master' into tunnel	2011-06-17 10:13:20 +02:00
zrtp.mk	fix audio for IOS5	2011-10-14 16:14:54 +02:00
zrtpcpp.CMakeLists.txt	Patches for srtp and zrtp.	2011-09-06 14:51:14 +02:00