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

4b22a26a

Commit 4b22a26a authored 16 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'master' of git+ssh://repos-sflphone-git@sflphone.org/~/sflphone

parents 4c20978e e3148eb8

Branches

Tags

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

configure.ac 1 addition, 1 deletion

configure.ac
sflphone-gtk/src/audioconf.c 10 additions, 7 deletions

sflphone-gtk/src/audioconf.c
sflphone-gtk/src/dbus.c 11 additions, 11 deletions

sflphone-gtk/src/dbus.c
src/audio/audiostream.cpp 10 additions, 2 deletions

src/audio/audiostream.cpp
src/audio/codecs/gsmcodec.cpp 1 addition, 1 deletion

src/audio/codecs/gsmcodec.cpp
src/audio/pulselayer.cpp 9 additions, 2 deletions

src/audio/pulselayer.cpp
src/audio/pulselayer.h 2 additions, 0 deletions

src/audio/pulselayer.h

with 44 additions and 24 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