Yann Diorcet
|
e541869c96
|
Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
Classes/ChatRoomViewController.m
Classes/ContactsViewController.m
Classes/HistoryDetailsViewController.h
Classes/HistoryDetailsViewController.m
Classes/LinphoneCoreSettingsStore.m
Classes/LinphoneManager.m
Classes/LinphoneUI/UIChatCell.m
Classes/LinphoneUI/UIChatCell.xib
Classes/LinphoneUI/UICompositeViewController.h
Classes/LinphoneUI/UICompositeViewController.m
Classes/PhoneMainView.m
Classes/SettingsViewController.m
Classes/WizardViewController.m
Classes/en.lproj/ChatViewController.xib
Classes/en.lproj/ContactDetailsViewController.xib
Classes/en.lproj/DialerViewController.xib
Classes/en.lproj/FirstLoginViewController.xib
Classes/en.lproj/HistoryDetailsViewController.xib
Classes/fr.lproj/ChatRoomViewController.xib
Classes/fr.lproj/ChatViewController.xib
Classes/fr.lproj/ContactDetailsViewController.xib
Classes/fr.lproj/DialerViewController.xib
Classes/fr.lproj/FirstLoginViewController.xib
Classes/fr.lproj/HistoryDetailsViewController.xib
Resources/en.lproj/Localizable.strings
Resources/fr.lproj/Localizable.strings
Resources/linphonerc-factory
Resources/linphonerc-factory~ipad
Settings.bundle/Advanced.plist
Settings/InAppSettings.bundle/Advanced.plist
Settings/InAppSettings.bundle/Call.plist
Settings/InAppSettings.bundle/en.lproj/Audio.strings
Settings/InAppSettings.bundle/en.lproj/Call.strings
Settings/InAppSettings.bundle/en.lproj/Root.strings
Settings/InAppSettings.bundle/fr.lproj/Audio.strings
Settings/InAppSettings.bundle/fr.lproj/Call.strings
Settings/InAppSettings.bundle/fr.lproj/Video.strings
linphone-Info.plist
linphone.ldb/Contents.plist
linphone.ldb/Resources/Classes/ChatViewController/17/ChatViewController.xib
linphone.ldb/Resources/Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib
linphone.ldb/Resources/Classes/DialerViewController/6/DialerViewController.xib
linphone.ldb/Resources/Classes/FirstLoginViewController/6/FirstLoginViewController.xib
linphone.ldb/Resources/Classes/HistoryDetailsViewController/8/HistoryDetailsViewController.xib
linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings
linphone.ldb/Resources/InAppSettings.bundle/Call/1/Call.strings
linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings
linphone.ldb/Resources/InAppSettings.bundle/Root/1/Root.strings
linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
linphone.xcodeproj/project.pbxproj
submodules/linphone
|
2012-11-07 11:15:31 +01:00 |
|
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 |
|
Simon Morlat
|
2e3d4c0fdf
|
many bugfixes, work in progress
|
2012-06-12 00:38:34 +02:00 |
|
Jehan Monnier
|
bdfa83b486
|
enable pcma by default
|
2011-12-06 16:28:09 +01:00 |
|
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 |
|
Jehan Monnier
|
df166a9a52
|
G722 support added
|
2011-07-26 15:29:40 +02:00 |
|
Jehan Monnier
|
bbfd7e9572
|
video integration
|
2011-07-12 10:38:17 +02:00 |
|