-
- Downloads
Merge branch 'master' into networkmanager
Conflicts: sflphone-common/src/dbus/configurationmanager.cpp sflphone-common/src/managerimpl.cpp sflphone-common/src/sip/sipaccount.cpp sflphone-common/src/sip/sipvoiplink.cpp
No related branches found
No related tags found
Showing
- sflphone-client-gnome/pixmaps/Makefile.am 1 addition, 0 deletionssflphone-client-gnome/pixmaps/Makefile.am
- sflphone-client-gnome/src/config/audioconf.c 9 additions, 4 deletionssflphone-client-gnome/src/config/audioconf.c
- sflphone-client-gnome/src/config/preferencesdialog.c 8 additions, 7 deletionssflphone-client-gnome/src/config/preferencesdialog.c
- sflphone-client-gnome/src/dbus/dbus.c 2 additions, 1 deletionsflphone-client-gnome/src/dbus/dbus.c
- sflphone-client-gnome/src/sflphone_const.h 1 addition, 0 deletionssflphone-client-gnome/src/sflphone_const.h
- sflphone-client-gnome/src/statusicon.c 30 additions, 22 deletionssflphone-client-gnome/src/statusicon.c
- sflphone-client-gnome/src/statusicon.h 5 additions, 0 deletionssflphone-client-gnome/src/statusicon.h
- sflphone-common/src/dbus/configurationmanager.cpp 2 additions, 2 deletionssflphone-common/src/dbus/configurationmanager.cpp
- sflphone-common/src/managerimpl.cpp 43 additions, 14 deletionssflphone-common/src/managerimpl.cpp
- sflphone-common/src/managerimpl.h 2 additions, 2 deletionssflphone-common/src/managerimpl.h
- sflphone-common/src/sip/sipaccount.cpp 1 addition, 1 deletionsflphone-common/src/sip/sipaccount.cpp
- sflphone-common/src/sip/sipaccount.h 1 addition, 1 deletionsflphone-common/src/sip/sipaccount.h
- sflphone-common/src/sip/sipvoiplink.cpp 49 additions, 17 deletionssflphone-common/src/sip/sipvoiplink.cpp
- sflphone-common/src/sip/sipvoiplink.h 6 additions, 1 deletionsflphone-common/src/sip/sipvoiplink.h
Loading
Please register or sign in to comment