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
mediastreamer2
Repository
mediastreamer2
CMakeLists.txt
Find file
Blame
History
Permalink
Merge branch '2.14.x'
· bd83c83b
Sandrine Avakian
authored
Aug 25, 2016
# Conflicts: # src/voip/ice.c # src/voip/stun.c # tester/CMakeLists.txt
bd83c83b