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
java
common
org
linphone
core
LinphoneCore.java
Find file
Blame
History
Permalink
Merge branch 'dev_conference' of git.linphone.org:linphone-private
· 5127119c
Guillaume Beraudo
authored
Sep 20, 2011
Conflicts: mediastreamer2
5127119c