Commit graph

2 commits

Author SHA1 Message Date
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
Jehan Monnier
dc6d630cda initial commit with basic ui 2010-01-22 11:44:23 +01:00