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

e3f65f31

Commit e3f65f31 authored 16 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'master' into contact_list

parents c549dcf6 2e8b6d44

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-gtk/src/hooks-config.c 19 additions, 5 deletions

sflphone-gtk/src/hooks-config.c
sflphone-gtk/src/hooks-config.h 3 additions, 3 deletions

sflphone-gtk/src/hooks-config.h
src/managerimpl.cpp 3 additions, 0 deletions

src/managerimpl.cpp
src/sipvoiplink.cpp 8 additions, 5 deletions

src/sipvoiplink.cpp
src/user_cfg.h 1 addition, 0 deletions

src/user_cfg.h

with 34 additions and 13 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