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

76e80641

Commit 76e80641 authored 15 years ago by Alexandre Savard

Downloads
- Plain Diff

Merge branch 'master' into conference

parents ec0c4ff2 f54d4220

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/src/contacts/calltree.c 9 additions, 8 deletions

sflphone-client-gnome/src/contacts/calltree.c
sflphone-client-gnome/src/mainwindow.c 0 additions, 2 deletions

sflphone-client-gnome/src/mainwindow.c
sflphone-client-gnome/src/mainwindow.h 1 addition, 1 deletion

sflphone-client-gnome/src/mainwindow.h
sflphone-client-gnome/src/toolbar.c 0 additions, 7 deletions

sflphone-client-gnome/src/toolbar.c
sflphone-client-gnome/src/ui.xml 3 additions, 3 deletions

sflphone-client-gnome/src/ui.xml
sflphone-client-gnome/src/uimanager.c 14 additions, 4 deletions

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

sflphone-client-gnome/src/uimanager.h

with 31 additions and 26 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