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

8ef29ee6

Commit 8ef29ee6 authored 15 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'conference'

Conflicts:
	sflphone-common/src/sip/sipaccount.cpp

parents c8879ae4 df9c88b8

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-client-gnome/src/config/accountconfigdialog.c 342 additions, 216 deletions

sflphone-client-gnome/src/config/accountconfigdialog.c
sflphone-client-gnome/src/sflphone_const.h 1 addition, 0 deletions

sflphone-client-gnome/src/sflphone_const.h
sflphone-common/src/account.h 1 addition, 0 deletions

sflphone-common/src/account.h
sflphone-common/src/managerimpl.cpp 9 additions, 1 deletion

sflphone-common/src/managerimpl.cpp
sflphone-common/src/sip/sipaccount.cpp 19 additions, 18 deletions

sflphone-common/src/sip/sipaccount.cpp
sflphone-common/src/sip/sipaccount.h 28 additions, 9 deletions

sflphone-common/src/sip/sipaccount.h

with 400 additions and 244 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