linphone-ios/submodules/build/builders.d
Simon Morlat eecb65d1d4 Merge remote-tracking branch 'public/master' into dev_videoios
Conflicts:
	Classes/LinphoneUI/LinphoneManager.m
	Classes/LinphoneUI/LinphoneUIDelegates.h
	Classes/LinphoneUI/UILinphone.h
	Settings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	linphonerc
	submodules/build/builder-iphone-os.mk
	submodules/liblinphone.xcodeproj/project.pbxproj
2011-11-01 22:20:12 +01:00
..
ffmpeg.mk Merge remote-tracking branch 'public/master' into dev_videoios 2011-10-19 11:36:27 +02:00
ffmpeg.patch Merge remote-tracking branch 'public/master' into dev_videoios 2011-10-19 11:36:27 +02:00
libvpx.mk fix vp8 2011-10-31 18:19:38 +01:00
libvpx.patch Merge remote-tracking branch 'public/master' into dev_videoios 2011-10-19 11:36:27 +02:00
msamr.mk fix veryclean for msamr 2011-06-17 10:18:08 +02:00
msx264.mk add msx264.mk 2011-07-22 10:00:46 +02:00
opencore-amr.mk fix bad tab in makefile ! 2011-08-17 22:14:03 +02:00
openssl.mk Patches for srtp and zrtp. 2011-09-06 14:51:14 +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
x264.mk - update linphone and ms2 submodules for rate control 2011-10-28 22:01:58 +02:00
x264.patch Merge remote-tracking branch 'public/master' into dev_videoios 2011-10-19 11:36:27 +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