Jehan Monnier
|
ddeaddf92d
|
Merge remote-tracking branch 'public/master' into dev_videoios
IOS migration
Conflicts:
.gitignore
.gitmodules
linphone-Info.plist
linphone.xcodeproj/project.pbxproj
submodules/build/builder-iphone-os.mk
submodules/build/iphone-config.site
submodules/externals/osip
submodules/liblinphone.xcodeproj/project.pbxproj
submodules/linphone
|
2011-10-19 11:36:27 +02:00 |
|