-
- Downloads
Merge branch 'master' into video_preview
Resolved Conflicts: sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml sflphone-client-gnome/src/dbus/dbus.h sflphone-common/src/dbus/configurationmanager-introspec.xml sflphone-common/src/history/historyitem.cpp
No related branches found
No related tags found
Showing
- hudson-sflphone-script.sh 1 addition, 1 deletionhudson-sflphone-script.sh
- sflphone-client-gnome/src/actions.c 72 additions, 29 deletionssflphone-client-gnome/src/actions.c
- sflphone-client-gnome/src/callable_obj.c 2 additions, 1 deletionsflphone-client-gnome/src/callable_obj.c
- sflphone-client-gnome/src/callable_obj.h 6 additions, 0 deletionssflphone-client-gnome/src/callable_obj.h
- sflphone-client-gnome/src/conference_obj.c 12 additions, 47 deletionssflphone-client-gnome/src/conference_obj.c
- sflphone-client-gnome/src/conference_obj.h 2 additions, 2 deletionssflphone-client-gnome/src/conference_obj.h
- sflphone-client-gnome/src/contacts/calltree.c 49 additions, 21 deletionssflphone-client-gnome/src/contacts/calltree.c
- sflphone-client-gnome/src/contacts/calltree.h 9 additions, 0 deletionssflphone-client-gnome/src/contacts/calltree.h
- sflphone-client-gnome/src/contacts/conferencelist.c 2 additions, 3 deletionssflphone-client-gnome/src/contacts/conferencelist.c
- sflphone-client-gnome/src/dbus/callmanager-introspec.xml 29 additions, 0 deletionssflphone-client-gnome/src/dbus/callmanager-introspec.xml
- sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml 29 additions, 26 deletions...-client-gnome/src/dbus/configurationmanager-introspec.xml
- sflphone-client-gnome/src/dbus/dbus.c 191 additions, 3 deletionssflphone-client-gnome/src/dbus/dbus.c
- sflphone-client-gnome/src/dbus/dbus.h 17 additions, 1 deletionsflphone-client-gnome/src/dbus/dbus.h
- sflphone-client-gnome/src/ui.xml 2 additions, 0 deletionssflphone-client-gnome/src/ui.xml
- sflphone-client-gnome/src/uimanager.c 100 additions, 6 deletionssflphone-client-gnome/src/uimanager.c
- sflphone-common/src/audio/audiorecord.cpp 5 additions, 0 deletionssflphone-common/src/audio/audiorecord.cpp
- sflphone-common/src/audio/audiorecord.h 17 additions, 0 deletionssflphone-common/src/audio/audiorecord.h
- sflphone-common/src/audio/codecs/audiocodecfactory.cpp 4 additions, 0 deletionssflphone-common/src/audio/codecs/audiocodecfactory.cpp
- sflphone-common/src/audio/recordable.cpp 4 additions, 2 deletionssflphone-common/src/audio/recordable.cpp
- sflphone-common/src/audio/recordable.h 13 additions, 5 deletionssflphone-common/src/audio/recordable.h
Loading
Please register or sign in to comment