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

5eafdc7f

Commit 5eafdc7f authored 13 years ago by Tristan Matthews

Downloads
- Plain Diff

Merge branch 'master' into flush_user_cfg

parents 4325a519 bbbeb728

No related branches found

No related tags found

No related merge requests found

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

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

sflphone-client-gnome/src/callable_obj.c
sflphone-client-gnome/src/conference_obj.c 14 additions, 10 deletions

sflphone-client-gnome/src/conference_obj.c
sflphone-common/src/audio/recordable.cpp 4 additions, 0 deletions

sflphone-common/src/audio/recordable.cpp
sflphone-common/src/managerimpl.cpp 2 additions, 0 deletions

sflphone-common/src/managerimpl.cpp

with 21 additions and 12 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