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

6281bb80

Commit 6281bb80 authored 16 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'master' into sip_server

parents 56d6ae97 59232af1

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

configure.ac 1 addition, 1 deletion

configure.ac
sflphone-gtk/configure.ac 3 additions, 3 deletions

sflphone-gtk/configure.ac
sflphone-gtk/src/actions.h 3 additions, 0 deletions

sflphone-gtk/src/actions.h
sflphone-gtk/src/configwindow.c 2 additions, 1 deletion

sflphone-gtk/src/configwindow.c
sflphone-gtk/src/dbus.c 9 additions, 5 deletions

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

sflphone-gtk/src/dbus.h
sflphone-gtk/src/historyfilter.c 6 additions, 1 deletion

sflphone-gtk/src/historyfilter.c
sflphone-gtk/src/mainwindow.c 12 additions, 8 deletions

sflphone-gtk/src/mainwindow.c
sflphone-gtk/src/menus.c 3 additions, 17 deletions

sflphone-gtk/src/menus.c

with 40 additions and 37 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