-
- Downloads
Merge branch 'sip_dev' of ssh://192.168.1.16/home-local/manu/dev/sfl/sflphone into yun-pjsip
Conflicts: src/sipcall.h
No related branches found
No related tags found
Showing
- sflphone-gtk/src/accountwindow.c 23 additions, 7 deletionssflphone-gtk/src/accountwindow.c
- sflphone-gtk/src/sflphone_const.h 2 additions, 0 deletionssflphone-gtk/src/sflphone_const.h
- src/account.h 2 additions, 0 deletionssrc/account.h
- src/managerimpl.cpp 4 additions, 2 deletionssrc/managerimpl.cpp
- src/managerimpl.h 1 addition, 1 deletionsrc/managerimpl.h
- src/sipcall.h 2 additions, 10 deletionssrc/sipcall.h
- src/sipmanager.cpp 74 additions, 16 deletionssrc/sipmanager.cpp
- src/sipmanager.h 2 additions, 0 deletionssrc/sipmanager.h
- src/sipvoiplink.cpp 1 addition, 13 deletionssrc/sipvoiplink.cpp
Loading
Please register or sign in to comment