Commit graph

6 commits

Author SHA1 Message Date
Jehan Monnier
8f74160e83 Merge remote-tracking branch 'origin/master' into belle-sip
Conflicts:
	.gitmodules
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/build/builders.d/libvpx.mk
	submodules/build/builders.d/mssilk.mk
	submodules/build/builders.d/opencore-amr.mk
	submodules/build/iphone-config.site
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
2013-06-04 10:31:39 +02:00
Jehan Monnier
2339dce285 port sdk to clang except for mssilk & opencore-amr 2013-06-03 09:00:48 +02:00
Jehan Monnier
23a54227aa first belle-sip version 2013-02-27 14:51:03 +01:00
Jehan Monnier
8a1c3000cd merge vios IOS with master 2011-11-18 14:23:41 +01:00
Guillaume Beraudo
fb2ddd1b33 Silk plugin for iPhone. 2011-11-03 13:44:49 +01:00
Guillaume
4b4319a628 Partial commit with changes on Sylvain's Mac. 2011-10-28 16:29:31 +02:00