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

b8ee67c7

Commit b8ee67c7 authored 16 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'client_warnings' into dbus_dev

parents 60642db9 d48e8233

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-gtk/src/actions.c 0 additions, 1 deletion

sflphone-gtk/src/actions.c
sflphone-gtk/src/assistant.c 27 additions, 1 deletion

sflphone-gtk/src/assistant.c
sflphone-gtk/src/assistant.h 6 additions, 18 deletions

sflphone-gtk/src/assistant.h
sflphone-gtk/src/calllist.c 2 additions, 0 deletions

sflphone-gtk/src/calllist.c
sflphone-gtk/src/calllist.h 1 addition, 0 deletions

sflphone-gtk/src/calllist.h
sflphone-gtk/src/calltree.c 2 additions, 3 deletions

sflphone-gtk/src/calltree.c
sflphone-gtk/src/calltree.h 0 additions, 1 deletion

sflphone-gtk/src/calltree.h
sflphone-gtk/src/dbus.c 6 additions, 8 deletions

sflphone-gtk/src/dbus.c
sflphone-gtk/src/dbus.h 1 addition, 0 deletions

sflphone-gtk/src/dbus.h
sflphone-gtk/src/errors.h 3 additions, 0 deletions

sflphone-gtk/src/errors.h
sflphone-gtk/src/mainwindow.c 1 addition, 1 deletion

sflphone-gtk/src/mainwindow.c
sflphone-gtk/src/mainwindow.h 1 addition, 0 deletions

sflphone-gtk/src/mainwindow.h
sflphone-gtk/src/menus.c 2 additions, 5 deletions

sflphone-gtk/src/menus.c
sflphone-gtk/src/timestamp.c 1 addition, 1 deletion

sflphone-gtk/src/timestamp.c

with 53 additions and 39 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