witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
linphone-ios/submodules/build/builders.d
History
Exact
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
..
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 fix x264 bug on iphone5 2012-11-09 02:04:10 +01: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