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

df4757de

Commit df4757de authored 14 years ago by Alexandre Savard

Downloads
- Plain Diff

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

parents 1ea4a1a1 494debca

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/src/config/assistant.c 3 additions, 3 deletions

sflphone-client-gnome/src/config/assistant.c
sflphone-client-gnome/src/config/audioconf.c 44 additions, 56 deletions

sflphone-client-gnome/src/config/audioconf.c
sflphone-client-gnome/src/config/hooks-config.c 4 additions, 7 deletions

sflphone-client-gnome/src/config/hooks-config.c
sflphone-client-gnome/src/config/utils.c 17 additions, 0 deletions

sflphone-client-gnome/src/config/utils.c
sflphone-client-gnome/src/config/utils.h 2 additions, 0 deletions

sflphone-client-gnome/src/config/utils.h
sflphone-client-gnome/src/dbus/dbus.c 0 additions, 2 deletions

sflphone-client-gnome/src/dbus/dbus.c
sflphone-common/src/audio/alsa/alsalayer.cpp 12 additions, 87 deletions

sflphone-common/src/audio/alsa/alsalayer.cpp
sflphone-common/src/main.cpp 6 additions, 4 deletions

sflphone-common/src/main.cpp

with 88 additions and 159 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