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

2a041c22

Commit 2a041c22 authored 13 years ago by Tristan Matthews

Downloads
- Plain Diff

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

parents 05b80231 20375709

No related branches found

No related tags found

No related merge requests found

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/src/actions.c 55 additions, 24 deletions

sflphone-client-gnome/src/actions.c
sflphone-client-gnome/src/conference_obj.c 6 additions, 3 deletions

sflphone-client-gnome/src/conference_obj.c
sflphone-client-gnome/src/conference_obj.h 1 addition, 2 deletions

sflphone-client-gnome/src/conference_obj.h
sflphone-client-gnome/src/uimanager.c 9 additions, 0 deletions

sflphone-client-gnome/src/uimanager.c
sflphone-common/src/history/historyitem.cpp 2 additions, 2 deletions

sflphone-common/src/history/historyitem.cpp

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