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

03c7a8f7

Commit 03c7a8f7 authored 17 years ago by sfl

Downloads
- Plain Diff

Merge commit 'origin/master' into video

parents c2333706 d792b6b0

Branches

Tags

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-gtk/src/codeclist.c 74 additions, 7 deletions

sflphone-gtk/src/codeclist.c
sflphone-gtk/src/codeclist.h 1 addition, 0 deletions

sflphone-gtk/src/codeclist.h
sflphone-gtk/src/configwindow.c 4 additions, 2 deletions

sflphone-gtk/src/configwindow.c
src/audio/codecDescriptor.cpp 13 additions, 1 deletion

src/audio/codecDescriptor.cpp
src/managerimpl.cpp 1 addition, 1 deletion

src/managerimpl.cpp

with 93 additions and 11 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