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
liblinphone
Repository
liblinphone
include
sal
sal.h
Find file
Blame
History
Permalink
Merge branch 'master' of git.linphone.org:linphone into dev_msfactory
· 825165d1
Sandrine Avakian
authored
Feb 01, 2016
# Conflicts: # mediastreamer2
825165d1