linphone-iphone/linphone.xcodeproj
Yann Diorcet 04b7a64b75 Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui
Conflicts:
	linphone.xcodeproj/project.pbxproj
2012-09-21 09:04:09 +02:00
..
.gitignore Add files to .gitignore 2012-09-11 17:58:57 +02:00
project.pbxproj Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-21 09:04:09 +02:00