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

1101b7bd

Commit 1101b7bd authored 13 years ago by Alexandre Savard

Downloads
- Plain Diff

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

Conflicts:
	daemon/src/sip/sipaccount.h

parents 203abebd 4f2d75f9

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

daemon/configure.ac 19 additions, 50 deletions

daemon/configure.ac
daemon/src/audio/sound/dtmfgenerator.cpp 5 additions, 6 deletions

daemon/src/audio/sound/dtmfgenerator.cpp
daemon/src/audio/sound/tone.cpp 16 additions, 18 deletions

daemon/src/audio/sound/tone.cpp
daemon/src/audio/sound/tone.h 0 additions, 3 deletions

daemon/src/audio/sound/tone.h
daemon/src/sip/sipaccount.cpp 76 additions, 72 deletions

daemon/src/sip/sipaccount.cpp
daemon/src/sip/sipaccount.h 50 additions, 49 deletions

daemon/src/sip/sipaccount.h
daemon/src/sip/sipvoiplink.cpp 13 additions, 8 deletions

daemon/src/sip/sipvoiplink.cpp
daemon/src/sip/sipvoiplink.h 1 addition, 1 deletion

daemon/src/sip/sipvoiplink.h
daemon/test/configurationtest.cpp 62 additions, 62 deletions

daemon/test/configurationtest.cpp
gnome/src/mainwindow.c 2 additions, 13 deletions

gnome/src/mainwindow.c
gnome/src/mainwindow.h 1 addition, 1 deletion

gnome/src/mainwindow.h

with 245 additions and 283 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