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
52040fc8
Commit
52040fc8
authored
13 years ago
by
Guillaume Beraudo
Browse files
Options
Download
Plain Diff
Merge branch 'master' of git.linphone.org:linphone into tunnel
parents
fdd53e63
173b02a2
No related merge requests found
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
Makefile.am
+12
-7
Makefile.am
NEWS
+8
-1
NEWS
README.macos
+9
-15
README.macos
README.mingw
+2
-5
README.mingw
coreapi/Makefile.am
+1
-1
coreapi/Makefile.am
coreapi/callbacks.c
+8
-6
coreapi/callbacks.c
coreapi/conference.c
+3
-0
coreapi/conference.c
coreapi/help/doxygen.dox
+32
-0
coreapi/help/doxygen.dox
coreapi/linphonecore.c
+3
-1
coreapi/linphonecore.c
coreapi/linphonecore.h
+2
-1
coreapi/linphonecore.h
coreapi/linphonecore_jni.cc
+4
-0
coreapi/linphonecore_jni.cc
coreapi/misc.c
+22
-22
coreapi/misc.c
coreapi/private.h
+0
-1
coreapi/private.h
coreapi/proxy.c
+3
-4
coreapi/proxy.c
coreapi/sal_eXosip2.c
+5
-10
coreapi/sal_eXosip2.c
gtk/friendlist.c
+124
-46
gtk/friendlist.c
gtk/incall_view.c
+2
-0
gtk/incall_view.c
gtk/main.c
+13
-6
gtk/main.c
gtk/main.ui
+9
-12
gtk/main.ui
gtk/parameters.ui
+1
-1
gtk/parameters.ui
with
263 additions
and
139 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
