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

a7201727

Commit a7201727 authored 15 years ago by Alexandre Savard

Downloads
- Plain Diff

Merge branch 'pierre-luc-0.9.8-sdes' into m_savard

parents 35994466 fa296d6d

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-common/src/sip/Pattern.cpp 0 additions, 14 deletions

sflphone-common/src/sip/Pattern.cpp
sflphone-common/src/sip/SdesNegotiator.cpp 68 additions, 54 deletions

sflphone-common/src/sip/SdesNegotiator.cpp
sflphone-common/src/sip/SdesNegotiator.h 92 additions, 62 deletions

sflphone-common/src/sip/SdesNegotiator.h
sflphone-common/test/sdesnegotiatorTest.cpp 32 additions, 33 deletions

sflphone-common/test/sdesnegotiatorTest.cpp
sflphone-common/test/sdesnegotiatorTest.h 10 additions, 8 deletions

sflphone-common/test/sdesnegotiatorTest.h

with 202 additions and 171 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