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

f13b7304

Commit f13b7304 authored 12 years ago by Tristan Matthews

Downloads
- Plain Diff

Merge branch 'master' into invite_no_sdp

parents 013963a5 8ddd1284

Branches

Tags

No related merge requests found

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

daemon/libs/compile_pjsip.sh 1 addition, 1 deletion

daemon/libs/compile_pjsip.sh
daemon/libs/iax2/iax-client.h 2 additions, 0 deletions

daemon/libs/iax2/iax-client.h
daemon/libs/pjproject/pjlib/include/pj/config.h 14 additions, 0 deletions

daemon/libs/pjproject/pjlib/include/pj/config.h
daemon/src/audio/audiortp/audio_rtp_factory.cpp 10 additions, 5 deletions

daemon/src/audio/audiortp/audio_rtp_factory.cpp
daemon/src/fileutils.cpp 2 additions, 0 deletions

daemon/src/fileutils.cpp
daemon/src/sip/sipvoiplink.cpp 8 additions, 2 deletions

daemon/src/sip/sipvoiplink.cpp
daemon/src/video/video_receive_thread.cpp 9 additions, 1 deletion

daemon/src/video/video_receive_thread.cpp
daemon/src/video/video_send_thread.cpp 19 additions, 4 deletions

daemon/src/video/video_send_thread.cpp

with 65 additions and 13 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