linphone-iphone/Settings.bundle
Pierre-Eric Pelloux-Prayer 17cc55d854 Merge remote-tracking branch 'public/master' into tunnel
Conflicts:
	Classes/LinphoneUI/LinphoneManager.h
	Settings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	nogpl-thirdparties/Settings.bundle/Root.plist
	submodules/build/builder-iphone-os.mk
	submodules/linphone
2012-02-06 13:22:39 +01:00
..
en.lproj initial commit with basic ui 2010-01-22 11:44:23 +01:00
Advanced.plist Moved Advanced settings to a new child panel 2012-01-13 11:38:43 +01:00
audio.plist enable pcma by default 2011-12-06 16:28:09 +01:00
Root.plist Merge remote-tracking branch 'public/master' into tunnel 2012-02-06 13:22:39 +01:00
Tunnel.plist Merge remote-tracking branch 'public/master' into tunnel 2012-02-06 13:22:39 +01:00
video.plist add *addvideo* button 2011-11-21 18:17:36 +01:00