-
- Downloads
Merge branch 'pierre-luc'
Conflicts: sflphone-client-gnome/src/config/accountwindow.c
Showing
- sflphone-client-gnome/src/config/accountwindow.c 112 additions, 45 deletionssflphone-client-gnome/src/config/accountwindow.c
- sflphone-client-gnome/src/sflphone_const.h 11 additions, 10 deletionssflphone-client-gnome/src/sflphone_const.h
- sflphone-common/src/account.h 1 addition, 0 deletionssflphone-common/src/account.h
- sflphone-common/src/call.cpp 0 additions, 4 deletionssflphone-common/src/call.cpp
- sflphone-common/src/managerimpl.cpp 12 additions, 14 deletionssflphone-common/src/managerimpl.cpp
- sflphone-common/src/managerimpl.h 0 additions, 5 deletionssflphone-common/src/managerimpl.h
- sflphone-common/src/sdp.cpp 1 addition, 1 deletionsflphone-common/src/sdp.cpp
- sflphone-common/src/sipaccount.cpp 5 additions, 0 deletionssflphone-common/src/sipaccount.cpp
- sflphone-common/src/sipaccount.h 3 additions, 0 deletionssflphone-common/src/sipaccount.h
- sflphone-common/src/sipcall.cpp 2 additions, 2 deletionssflphone-common/src/sipcall.cpp
- sflphone-common/src/sipvoiplink.cpp 36 additions, 13 deletionssflphone-common/src/sipvoiplink.cpp
- sflphone-common/src/user_cfg.h 1 addition, 2 deletionssflphone-common/src/user_cfg.h
Loading
Please register or sign in to comment