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
b07b7845
Commit
b07b7845
authored
13 years ago
by
Guillaume Beraudo
Browse files
Options
Download
Patches
Plain Diff
Conferencing JNI + Android support.
Conflicts: coreapi/conference.c coreapi/linphonecore.h
parent
0a9e2d37
No related merge requests found
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
build/android/Android.mk
+1
-0
build/android/Android.mk
coreapi/conference.c
+3
-0
coreapi/conference.c
coreapi/linphonecore.h
+3
-0
coreapi/linphonecore.h
coreapi/linphonecore_jni.cc
+40
-0
coreapi/linphonecore_jni.cc
java/common/org/linphone/core/LinphoneCall.java
+15
-6
java/common/org/linphone/core/LinphoneCall.java
java/common/org/linphone/core/LinphoneCore.java
+15
-1
java/common/org/linphone/core/LinphoneCore.java
mediastreamer2
+1
-1
mediastreamer2
with
78 additions
and
8 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