Commit graph

2 commits

Author SHA1 Message Date
Simon Morlat
479031cbc8 add polarssl into the build and update srtp to fix duplicated symbols 2013-05-09 18:08:47 +02:00
Simon Morlat
c422b7b553 Merge remote-tracking branch 'public/master' into belle-sip
and add polarssl
Conflicts:
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
2013-05-07 22:55:03 +02:00