Commit graph

6 commits

Author SHA1 Message Date
Jehan Monnier
a08d63f4fc Merge branch 'master' into tunnel
Conflicts:
	submodules/build/builder-iphone-os.mk
2011-03-23 15:51:07 +01:00
Jehan Monnier
13399e424a migrate liblinphone sdk compilation to xcode4 2011-03-23 14:01:05 +01:00
Jehan Monnier
d353f79527 Merge branch 'build-ssl' into tunnel
Conflicts:
	submodules/build/builder-iphone-os.mk
2011-03-19 17:56:33 +01:00
Jehan Monnier
661853b70a fix openssl build 2011-03-18 20:55:06 +01:00
Jehan Monnier
b558703c8f add build script for open ssl 2011-03-18 20:18:34 +01:00
Jehan Monnier
a0f30669db implement tunnel 2011-03-17 12:36:25 +01:00