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
7f649c56
Commit
7f649c56
authored
14 years ago
by
Simon Morlat
Browse files
Options
Download
Plain Diff
Merge branch 'master' of git.linphone.org:linphone-private
parents
50d4dbf6
737997cb
No related merge requests found
Changes
60
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
NEWS
+4
-2
NEWS
autogen.sh
+1
-1
autogen.sh
configure.in
+1
-1
configure.in
coreapi/callbacks.c
+14
-5
coreapi/callbacks.c
coreapi/linphonecore.c
+52
-22
coreapi/linphonecore.c
coreapi/linphonecore.h
+6
-0
coreapi/linphonecore.h
coreapi/misc.c
+64
-2
coreapi/misc.c
coreapi/private.h
+1
-1
coreapi/private.h
coreapi/sal.h
+2
-0
coreapi/sal.h
coreapi/sal_eXosip2.c
+65
-27
coreapi/sal_eXosip2.c
coreapi/sal_eXosip2.h
+1
-0
coreapi/sal_eXosip2.h
coreapi/sal_eXosip2_presence.c
+3
-1
coreapi/sal_eXosip2_presence.c
coreapi/sal_eXosip2_sdp.c
+6
-0
coreapi/sal_eXosip2_sdp.c
gtk-glade/friendlist.c
+12
-12
gtk-glade/friendlist.c
gtk-glade/incall_view.c
+1
-2
gtk-glade/incall_view.c
gtk-glade/linphone.ico
+0
-0
gtk-glade/linphone.ico
gtk-glade/main.c
+32
-4
gtk-glade/main.c
gtk-glade/main.glade
+334
-263
gtk-glade/main.glade
gtk-glade/parameters.glade
+15
-4
gtk-glade/parameters.glade
gtk-glade/propertybox.c
+14
-0
gtk-glade/propertybox.c
with
628 additions
and
347 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