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

c2a052bc

Commit c2a052bc authored May 1, 2012 by Tristan Matthews

Downloads
- Plain Diff

Merge branch 'master' of...

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

Resolved Conflicts:
	daemon/src/audio/audiortp/audio_rtp_factory.cpp

parents d8c8aab1 123d79c8

Branches

Tags

No related merge requests found

Changes 44

Show whitespace changes

Inline Side-by-side

Showing

daemon/Makefile.am 1 addition, 2 deletions

daemon/Makefile.am
daemon/src/account.h 4 additions, 4 deletions

daemon/src/account.h
daemon/src/audio/audiortp/audio_rtp_factory.cpp 12 additions, 6 deletions

daemon/src/audio/audiortp/audio_rtp_factory.cpp
daemon/src/dbus/configurationmanager-introspec.xml 3 additions, 4 deletions

daemon/src/dbus/configurationmanager-introspec.xml
daemon/src/iax/iaxaccount.cpp 1 addition, 1 deletion

daemon/src/iax/iaxaccount.cpp
daemon/src/sip/sipaccount.cpp 9 additions, 3 deletions

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

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

daemon/src/sip/sipvoiplink.cpp
gnome/INSTALL 7 additions, 2 deletions

gnome/INSTALL
gnome/src/actions.c 3 additions, 3 deletions

gnome/src/actions.c
gnome/src/conference_obj.c 1 addition, 1 deletion

gnome/src/conference_obj.c
gnome/src/contacts/calltree.c 1 addition, 1 deletion

gnome/src/contacts/calltree.c
gnome/src/dbus/configurationmanager-introspec.xml 3 additions, 3 deletions

gnome/src/dbus/configurationmanager-introspec.xml
gnome/src/dbus/dbus.c 2 additions, 2 deletions

gnome/src/dbus/dbus.c
gnome/src/sflphone_const.h 4 additions, 4 deletions

gnome/src/sflphone_const.h
kde/CMakeLists.txt 4 additions, 3 deletions

kde/CMakeLists.txt
kde/src/AccountView.cpp 8 additions, 8 deletions

kde/src/AccountView.cpp
kde/src/AccountWizard.cpp 10 additions, 10 deletions

kde/src/AccountWizard.cpp
kde/src/AkonadiBackend.cpp 44 additions, 3 deletions

kde/src/AkonadiBackend.cpp
kde/src/AkonadiBackend.h 8 additions, 4 deletions

kde/src/AkonadiBackend.h

with 145 additions and 66 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