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

57c0747d

Commit 57c0747d 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 41402c75 653a8a3b

No related branches found

No related tags found

No related merge requests found

Changes 12

Show whitespace changes

Inline Side-by-side

Showing

daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp 0 additions, 1 deletion

daemon/src/audio/audiortp/AudioRtpRecordHandler.cpp
daemon/src/audio/mainbuffer.cpp 41 additions, 163 deletions

daemon/src/audio/mainbuffer.cpp
daemon/src/audio/mainbuffer.h 1 addition, 5 deletions

daemon/src/audio/mainbuffer.h
daemon/src/audio/pulseaudio/pulselayer.cpp 1 addition, 1 deletion

daemon/src/audio/pulseaudio/pulselayer.cpp
daemon/src/conference.cpp 22 additions, 92 deletions

daemon/src/conference.cpp
daemon/src/conference.h 1 addition, 8 deletions

daemon/src/conference.h
daemon/src/managerimpl.cpp 48 additions, 105 deletions

daemon/src/managerimpl.cpp
daemon/src/managerimpl.h 0 additions, 3 deletions

daemon/src/managerimpl.h
daemon/src/sip/sipcall.cpp 2 additions, 9 deletions

daemon/src/sip/sipcall.cpp
daemon/src/sip/sipcall.h 5 additions, 42 deletions

daemon/src/sip/sipcall.h
daemon/src/sip/sipvoiplink.cpp 27 additions, 29 deletions

daemon/src/sip/sipvoiplink.cpp
gnome/src/actions.c 0 additions, 1 deletion

gnome/src/actions.c

with 148 additions and 459 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