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

342fb387

Commit 342fb387 authored 17 years ago by sfl

Downloads
- Plain Diff

Merge commit 'origin/master' into video

parents fb17599d 95a8c71f

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-gtk/src/configwindow.c 145 additions, 39 deletions

sflphone-gtk/src/configwindow.c
sflphone-gtk/src/configwindow.h 2 additions, 1 deletion

sflphone-gtk/src/configwindow.h
src/audio/audiolayer.h 4 additions, 12 deletions

src/audio/audiolayer.h
src/managerimpl.cpp 26 additions, 14 deletions

src/managerimpl.cpp

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