linphone-ios/.gitignore
Simon Morlat da9ec193d5 Merge branch 'master' into dev_videoios
Conflicts:
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/linphone
2011-08-20 12:35:07 +02:00

2 lines
9 B
Text