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

fd580e2f

Commit fd580e2f authored 15 years ago by Alexandre Savard

Downloads
- Plain Diff

Merge branch 'master' into conference

parents 8a698de3 44065b77

Branches

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/src/actions.c 1 addition, 5 deletions

sflphone-client-gnome/src/actions.c
sflphone-client-gnome/src/actions.h 1 addition, 1 deletion

sflphone-client-gnome/src/actions.h
sflphone-client-gnome/src/dbus/dbus.c 1 addition, 1 deletion

sflphone-client-gnome/src/dbus/dbus.c
sflphone-client-gnome/src/main.c 3 additions, 0 deletions

sflphone-client-gnome/src/main.c
sflphone-common/libs/pjproject/pjlib/include/pj/compat/string.h 2 additions, 2 deletions

...ne-common/libs/pjproject/pjlib/include/pj/compat/string.h
sflphone-common/src/audio/codecs/speexcodec_nb.cpp 1 addition, 1 deletion

sflphone-common/src/audio/codecs/speexcodec_nb.cpp
sflphone-common/src/audio/codecs/speexcodec_wb.cpp 1 addition, 1 deletion

sflphone-common/src/audio/codecs/speexcodec_wb.cpp
sflphone-common/src/sip/sipvoiplink.cpp 15 additions, 16 deletions

sflphone-common/src/sip/sipvoiplink.cpp

with 25 additions and 27 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