Skip to content
Snippets Groups Projects
Select Git revision
  • master default protected
  • release/202005
  • release/202001
  • release/201912
  • release/201911
  • release/releaseWindowsTestOne
  • release/windowsReleaseTest
  • release/releaseTest
  • release/releaseWindowsTest
  • release/201910
  • release/qt/201910
  • release/windows-test/201910
  • release/201908
  • release/201906
  • release/201905
  • release/201904
  • release/201903
  • release/201902
  • release/201901
  • release/201812
  • 4.0.0
  • 2.2.0
  • 2.1.0
  • 2.0.1
  • 2.0.0
  • 1.4.1
  • 1.4.0
  • 1.3.0
  • 1.2.0
  • 1.1.0
30 results

jami-daemon

  • Clone with SSH
  • Clone with HTTPS
  • user avatar
    Tristan Matthews authored
    Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview
    
    Resolved Conflicts:
    	daemon/src/account.cpp
    	daemon/src/audio/audiortp/audio_rtp_session.h
    	daemon/src/sip/sipvoiplink.cpp
    	gnome/src/accountlist.h
    	gnome/src/actions.c
    	gnome/src/codeclist.c
    	gnome/src/codeclist.h
    	gnome/src/config/accountconfigdialog.c
    	gnome/src/config/audioconf.c
    	gnome/src/dbus/dbus.c
    	gnome/tests/Makefile.am
    d47564e8
    History
    Name Last commit Last update