witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
linphone-ios/submodules/build
History
Yann Diorcet d2ed3855e1 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/ChatRoomTableViewController.m
	Classes/ChatRoomViewController.m
	Classes/ContactDetailsTableViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UICallBar.m
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIStateBar.m
	Classes/LinphoneUI/en.lproj/UICallBar.xib
	Classes/LinphoneUI/fr.lproj/UICallBar.xib
	Classes/en.lproj/ChatViewController.xib
	Classes/fr.lproj/ChatViewController.xib
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ChatViewController/19/ChatViewController.xib
	linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings
	linphone.ldb/Resources/LinphoneUI/UICallBar/12/UICallBar.xib
	linphone.xcodeproj/project.pbxproj
2012-11-20 14:32:54 +01:00
..
builders.d Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-11-20 14:32:54 +01:00
builder-iphone-os.mk Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-09-26 12:34:12 +02:00
builder-iphone-simulator.mk add build scripts 2010-07-18 22:31:52 +02:00
iphone-config.site xcode 4.6/ios6 support 2012-09-18 15:55:11 +02:00
iphone-toolchain.cmake fix audio for IOS5 2011-10-14 16:14:54 +02:00
Makefile remove armv6 build 2012-09-21 22:29:33 +02:00
Makefile.xcode4.4 remove armv6 build 2012-09-21 22:29:33 +02:00