Simon Morlat 9af95dc58e Merge remote-tracking branch 'origin/master' into tunnel ... Conflicts: Classes/LinphoneUI/LinphoneManager.m linphone.xcodeproj/project.pbxproj submodules/build/Makefile submodules/externals/exosip submodules/liblinphone.xcodeproj/project.pbxproj submodules/linphone submodules/mssilk		2012-04-26 15:09:04 +02:00
..
en.lproj	initial commit with basic ui	2010-01-22 11:44:23 +01:00
Advanced.plist	Wifi only advanced toogle setting	2012-04-25 15:16:25 +02: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