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

a2e793a2

Commit a2e793a2 authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'm_savard'

parents 74a2f3d6 4778e2f1

Branches

Tags

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-common/src/audio/audiortp.cpp 21 additions, 18 deletions

sflphone-common/src/audio/audiortp.cpp
sflphone-common/src/audio/codecs/audiocodec.h 18 additions, 0 deletions

sflphone-common/src/audio/codecs/audiocodec.h
sflphone-common/src/sipvoiplink.cpp 27 additions, 24 deletions

sflphone-common/src/sipvoiplink.cpp

with 66 additions and 42 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