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

4a9d8b81

Commit 4a9d8b81 authored 14 years ago by Julien Bonjean

Downloads
- Plain Diff

Merge branch 'master' into jbonjean

parents 4629fb04 7c9ac0c0

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/src/actions.c 11 additions, 9 deletions

sflphone-client-gnome/src/actions.c
sflphone-client-gnome/src/callable_obj.c 20 additions, 16 deletions

sflphone-client-gnome/src/callable_obj.c
sflphone-client-gnome/src/callable_obj.h 2 additions, 4 deletions

sflphone-client-gnome/src/callable_obj.h
sflphone-client-gnome/src/config/preferencesdialog.c 1 addition, 0 deletions

sflphone-client-gnome/src/config/preferencesdialog.c
sflphone-client-gnome/src/contacts/calltree.c 8 additions, 3 deletions

sflphone-client-gnome/src/contacts/calltree.c
sflphone-client-gnome/src/contacts/calltree.h 4 additions, 1 deletion

sflphone-client-gnome/src/contacts/calltree.h
sflphone-client-gnome/src/dbus/dbus.c 2 additions, 2 deletions

sflphone-client-gnome/src/dbus/dbus.c
sflphone-client-gnome/src/mainwindow.c 54 additions, 6 deletions

sflphone-client-gnome/src/mainwindow.c
sflphone-client-gnome/src/mainwindow.h 10 additions, 2 deletions

sflphone-client-gnome/src/mainwindow.h

with 112 additions and 43 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