Simon Morlat
c422b7b553
Merge remote-tracking branch 'public/master' into belle-sip
...
and add polarssl
Conflicts:
submodules/liblinphone.xcodeproj/project.pbxproj
submodules/linphone
2013-05-07 22:55:03 +02:00
Jehan Monnier
93c8a62dbd
fix x264 bug on iphone5
2012-11-09 02:04:10 +01:00
Simon Morlat
f02f9f38f4
- update linphone and ms2 submodules for rate control
...
- fix build issues
- fix all black video screen
- fix microphone button not restored in initial state
- attempt to disable idle timer, but with limited success...
2011-10-28 22:01:58 +02:00
Jehan Monnier
827bc6bb0e
fix x264 lib not installed
2011-10-26 11:26:26 +02:00
Jehan Monnier
a8688f5012
fix build issue for sdk
2011-10-26 10:39:23 +02:00
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
Jehan Monnier
6cd52eb015
enable x264
2011-07-20 16:36:13 +02:00
