Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
liblinphone
Commits
6b36e5ac
Commit
6b36e5ac
authored
6 years ago
by
Simon Morlat
Browse files
Options
Download
Plain Diff
Merge branch 'master' into fix/conference_refactoring
parents
31174cf7
4d019574
1 merge request
!196
Fix/conference refactoring
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
coreapi/call_log.c
+5
-0
coreapi/call_log.c
coreapi/private_functions.h
+1
-0
coreapi/private_functions.h
src/conference/session/call-session.cpp
+2
-2
src/conference/session/call-session.cpp
src/core/platform-helpers/android-platform-helpers.cpp
+30
-29
src/core/platform-helpers/android-platform-helpers.cpp
tester/group_chat_tester.c
+32
-29
tester/group_chat_tester.c
with
70 additions
and
60 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets
