Simon Morlat da9ec193d5 Merge branch 'master' into dev_videoios ... Conflicts: linphone.xcodeproj/project.pbxproj submodules/build/builder-iphone-os.mk submodules/linphone		2011-08-20 12:35:07 +02:00
..
ffmpeg.mk	enable x264	2011-07-20 16:36:13 +02:00
libvpx.mk	ios: use --force-target option to enable x86 with darwin10	2011-08-04 08:52:57 +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	migrate liblinphone sdk compilation to xcode4	2011-03-23 14:01:05 +01:00
x264.mk	enable x264	2011-07-20 16:36:13 +02:00