Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-daemon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Incidents

Snippets Groups Projects

8a990e68

Commit 8a990e68 authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'fonseca'

Conflicts:
	sflphone-common/src/managerimpl.cpp

parents b6ea895f 03bc6ec8

Branches

Tags

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/doc/C/sflphone.xml 26 additions, 24 deletions

sflphone-client-gnome/doc/C/sflphone.xml
sflphone-client-gnome/globals.mak 1 addition, 0 deletions

sflphone-client-gnome/globals.mak
sflphone-client-gnome/src/actions.c 1 addition, 1 deletion

sflphone-client-gnome/src/actions.c
sflphone-client-gnome/src/contacts/calltree.c 54 additions, 1 deletion

sflphone-client-gnome/src/contacts/calltree.c
sflphone-client-gnome/src/dbus/dbus.c 1 addition, 1 deletion

sflphone-client-gnome/src/dbus/dbus.c
sflphone-client-gnome/src/main.c 1 addition, 1 deletion

sflphone-client-gnome/src/main.c
sflphone-client-gnome/src/mainwindow.c 2 additions, 3 deletions

sflphone-client-gnome/src/mainwindow.c
sflphone-common/src/managerimpl.cpp 25 additions, 19 deletions

sflphone-common/src/managerimpl.cpp

with 111 additions and 50 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment