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

66a47ba3

Commit 66a47ba3 authored 13 years ago by Alexandre Savard

Downloads
- Plain Diff

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

parents 48c24139 d1cb9540

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-common/src/audio/audiorecord.cpp 1 addition, 1 deletion

sflphone-common/src/audio/audiorecord.cpp
sflphone-common/src/audio/audiorecord.h 1 addition, 1 deletion

sflphone-common/src/audio/audiorecord.h
sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp 2 additions, 2 deletions

sflphone-common/src/audio/audiortp/AudioRtpFactory.cpp
sflphone-common/src/audio/recordable.cpp 2 additions, 2 deletions

sflphone-common/src/audio/recordable.cpp
sflphone-common/src/audio/recordable.h 1 addition, 1 deletion

sflphone-common/src/audio/recordable.h
sflphone-common/src/call.h 1 addition, 1 deletion

sflphone-common/src/call.h
sflphone-common/src/iax/iaxvoiplink.cpp 1 addition, 1 deletion

sflphone-common/src/iax/iaxvoiplink.cpp

with 9 additions and 9 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