linphone-iphone/linphone.xcodeproj
Jehan Monnier 5aa42780c1 Merge remote-tracking branch 'origin/master' into tunnel
Conflicts:
	Classes/LinphoneUI/LinphoneManager.m
2012-05-14 12:12:09 +02:00
..
project.pbxproj Merge remote-tracking branch 'origin/master' into tunnel 2012-05-14 12:12:09 +02:00