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

93b2b8b3

Commit 93b2b8b3 authored 15 years ago by Alexandre Savard

Downloads
- Plain Diff

Merge branch 'm_savard'

Conflicts:
	sflphone-common/src/managerimpl.cpp

parents 2127657b ea00c340

Branches

Tags

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

sflphone-common/src/managerimpl.cpp 19 additions, 25 deletions

sflphone-common/src/managerimpl.cpp
sflphone-common/src/numbercleaner.h 3 additions, 1 deletion

sflphone-common/src/numbercleaner.h
sflphone-common/src/sip/sipvoiplink.cpp 82 additions, 72 deletions

sflphone-common/src/sip/sipvoiplink.cpp

with 104 additions and 98 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