Simon Morlat e03056ae6e Merge branch 'master' into tunnel ... not fully working Conflicts: Classes/LinphoneUI/LinphoneManager.h Classes/LinphoneUI/LinphoneManager.m linphone.xcodeproj/project.pbxproj submodules/build/Makefile submodules/build/builder-iphone-os.mk submodules/build/builders.d/openssl.mk submodules/liblinphone.xcodeproj/project.pbxproj		2011-12-12 18:28:03 +01:00
..
en.lproj	initial commit with basic ui	2010-01-22 11:44:23 +01:00
audio.plist	enable pcma by default	2011-12-06 16:28:09 +01:00
Root.plist	Merge branch 'master' into tunnel	2011-12-12 18:28:03 +01:00
video.plist	add *addvideo* button	2011-11-21 18:17:36 +01:00