Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
ortp
Repository
ortp
src
zrtp.c
Find file
Blame
History
Permalink
Merge branch 'master' of git.linphone.org:ortp into zrtp
· a5b61d2b
Guillaume Beraudo
authored
Nov 18, 2011
Conflicts: src/zrtp.c
a5b61d2b