witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
linphone-ios/submodules/build/builders.d
History
Yann Diorcet d2253e0532 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/AboutViewController.h
	Classes/AboutViewController.m
	Classes/AboutViewController.xib
	Classes/ChatRoomTableViewController.m
	Classes/ChatRoomViewController.m
	Classes/ChatTableViewController.m
	Classes/ContactDetailsTableViewController.m
	Classes/ContactDetailsViewController.m
	Classes/ContactsTableViewController.m
	Classes/HistoryDetailsViewController.m
	Classes/HistoryTableViewController.m
	Classes/HistoryViewController.m
	Classes/ImageViewController.h
	Classes/ImageViewController.m
	Classes/InCallTableViewController.h
	Classes/InCallTableViewController.m
	Classes/InCallViewController.m
	Classes/IncomingCallViewController.h
	Classes/IncomingCallViewController.m
	Classes/LinphoneAppDelegate.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UICallBar.m
	Classes/LinphoneUI/UICallCell.h
	Classes/LinphoneUI/UICallCell.m
	Classes/LinphoneUI/UIChatCell.m
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UIChatRoomCell.xib
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/UIMainBar.m
	Classes/LinphoneUI/UIStateBar.m
	Classes/LinphoneUI/en.lproj/UICallBar.xib
	Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib
	Classes/LinphoneUI/en.lproj/UICallCell.xib
	Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib
	Classes/LinphoneUI/fr.lproj/UICallBar.xib
	Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib
	Classes/LinphoneUI/fr.lproj/UICallCell.xib
	Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib
	Classes/PhoneMainView.m
	Classes/SettingsViewController.m
	Classes/WizardViewController.h
	Classes/WizardViewController.m
	Classes/en.lproj/DialerViewController.xib
	Classes/en.lproj/IncomingCallViewController.xib
	Classes/fr.lproj/DialerViewController.xib
	Classes/fr.lproj/IncomingCallViewController.xib
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	Settings.bundle/Root.plist
	Settings/InAppSettings.bundle/en.lproj/Audio.strings
	Settings/InAppSettings.bundle/fr.lproj/Audio.strings
	linphone-Info.plist
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/DialerViewController/5/DialerViewController.xib
	linphone.ldb/Resources/Classes/ImageViewController/11/ImageViewController.xib
	linphone.ldb/Resources/Classes/IncomingCallViewController/9/IncomingCallViewController.xib
	linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings
	linphone.ldb/Resources/LinphoneUI/UICallBar/10/UICallBar.xib
	linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/8/UICallBar~ipad.xib
	linphone.ldb/Resources/LinphoneUI/UICallCell/10/UICallCell.xib
	linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/6/UIConferenceHeader.xib
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
	submodules/build/builders.d/openssl.mk
2012-10-10 13:04:05 +02:00
..
ffmpeg.mk Merge remote-tracking branch 'public/master' into dev_videoios 2011-10-19 11:36:27 +02:00
ffmpeg.patch Merge remote-tracking branch 'public/master' into dev_videoios 2011-10-19 11:36:27 +02:00
libvpx.mk remove armv6 build 2012-09-21 22:29:33 +02:00
libvpx.patch fix build for xcode4.4 2012-09-18 15:55:36 +02:00
msamr.mk fix veryclean for msamr 2011-06-17 10:18:08 +02:00
msbcg729.mk g729A integration based on bcg729 2012-02-16 15:46:45 +01:00
mssilk.mk merge vios IOS with master 2011-11-18 14:23:41 +01:00
msx264.mk add msx264.mk 2011-07-22 10:00:46 +02:00
opencore-amr.mk fix bad tab in makefile ! 2011-08-17 22:14:03 +02:00
openssl.mk Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-10-10 13:04:05 +02:00
openssl.patch Patches for srtp and zrtp. 2011-09-06 14:51:14 +02:00
srtp.mk implement wifi only mode 2012-05-02 09:25:39 +02:00
srtp.patch fix srtp install 2011-11-14 16:51:03 +01:00
x264.mk - update linphone and ms2 submodules for rate control 2011-10-28 22:01:58 +02:00
x264.patch Merge remote-tracking branch 'public/master' into dev_videoios 2011-10-19 11:36:27 +02:00
zrtp.mk merge vios IOS with master 2011-11-18 14:23:41 +01:00