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

24bd1575

Commit 24bd1575 authored 13 years ago by Tristan Matthews

Downloads
- Plain Diff

Merge branch 'video_preview' of...

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

parents 25efc54b e8a99a82

No related branches found

No related tags found

No related merge requests found

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

sflphone-common/src/managerimpl.h 13 additions, 0 deletions

sflphone-common/src/managerimpl.h
sflphone-common/src/video/video_receive_thread.cpp 10 additions, 4 deletions

sflphone-common/src/video/video_receive_thread.cpp
sflphone-common/src/video/video_send_thread.cpp 13 additions, 6 deletions

sflphone-common/src/video/video_send_thread.cpp

with 36 additions and 10 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