Commit graph

4 commits

Author SHA1 Message Date
Jehan Monnier
bdfa83b486 enable pcma by default 2011-12-06 16:28:09 +01:00
Jehan Monnier
0ad82b4cff Merge remote-tracking branch 'private/dev_videoios'
Conflicts:
	.gitmodules
	Classes/LinphoneAppDelegate.m
	Settings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
2011-11-15 10:54:56 +01:00
Jehan Monnier
df166a9a52 G722 support added 2011-07-26 15:29:40 +02:00
Jehan Monnier
bbfd7e9572 video integration 2011-07-12 10:38:17 +02:00