witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
linphone-ios/Settings.bundle
History
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
..
en.lproj initial commit with basic ui 2010-01-22 11:44:23 +01:00
audio.plist Merge remote-tracking branch 'private/dev_videoios' 2011-11-15 10:54:56 +01:00
Root.plist Merge remote-tracking branch 'private/dev_videoios' 2011-11-15 10:54:56 +01:00
video.plist Merge remote-tracking branch 'private/dev_videoios' 2011-11-15 10:54:56 +01:00