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

79365bd2

Commit 79365bd2 authored 13 years ago by Tristan Matthews

Downloads
- Plain Diff

Merge branch 'master' into sipregistration

parents d83cb80a 279af0f7

Branches

Tags

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

daemon/src/account.h 0 additions, 7 deletions

daemon/src/account.h
daemon/src/audio/audiorecord.cpp 9 additions, 69 deletions

daemon/src/audio/audiorecord.cpp
daemon/src/audio/audiorecord.h 2 additions, 27 deletions

daemon/src/audio/audiorecord.h
daemon/src/audio/audiorecorder.cpp 4 additions, 5 deletions

daemon/src/audio/audiorecorder.cpp
daemon/src/dbus/configurationmanager.cpp 9 additions, 13 deletions

daemon/src/dbus/configurationmanager.cpp
daemon/src/dbus/networkmanager.cpp 4 additions, 4 deletions

daemon/src/dbus/networkmanager.cpp
daemon/src/dbus/networkmanager.h 1 addition, 1 deletion

daemon/src/dbus/networkmanager.h
daemon/src/fileutils.cpp 1 addition, 1 deletion

daemon/src/fileutils.cpp
daemon/src/iax/iaxaccount.cpp 6 additions, 13 deletions

daemon/src/iax/iaxaccount.cpp
daemon/src/iax/iaxaccount.h 2 additions, 6 deletions

daemon/src/iax/iaxaccount.h
daemon/src/sip/sipaccount.cpp 12 additions, 8 deletions

daemon/src/sip/sipaccount.cpp
daemon/src/sip/sipaccount.h 3 additions, 1 deletion

daemon/src/sip/sipaccount.h
gnome/src/accountlist.h 20 additions, 20 deletions

gnome/src/accountlist.h
gnome/src/config/accountconfigdialog.c 4 additions, 2 deletions

gnome/src/config/accountconfigdialog.c

with 77 additions and 177 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