Skip to content
Snippets Groups Projects
Select Git revision
  • b51c1b8223da20b338f075480682592da843c870
  • 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
31 results

accountlist.h

  • Tristan Matthews's avatar
    fa4617b2
    Merge branch 'master' of... · fa4617b2
    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.h
    	daemon/src/audio/codecs/celtcodec.cpp
    	daemon/src/audio/pulseaudio/pulselayer.cpp
    	daemon/src/config/sfl_config.cpp
    	daemon/src/config/yamlemitter.cpp
    	daemon/src/config/yamlemitter.h
    	daemon/src/config/yamlparser.cpp
    	daemon/src/main.cpp
    	daemon/src/preferences.cpp
    	daemon/src/preferences.h
    	daemon/src/sip/sdp.cpp
    	daemon/src/sip/sdp.h
    	daemon/src/sip/sipaccount.cpp
    	daemon/src/sip/sipvoiplink.cpp
    	daemon/test/audiolayertest.h
    	daemon/test/gaincontroltest.cpp
    	daemon/test/sdptest.cpp
    	gnome/configure.ac
    	gnome/src/dbus/dbus.c
    fa4617b2
    History
    Merge branch 'master' of...
    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.h
    	daemon/src/audio/codecs/celtcodec.cpp
    	daemon/src/audio/pulseaudio/pulselayer.cpp
    	daemon/src/config/sfl_config.cpp
    	daemon/src/config/yamlemitter.cpp
    	daemon/src/config/yamlemitter.h
    	daemon/src/config/yamlparser.cpp
    	daemon/src/main.cpp
    	daemon/src/preferences.cpp
    	daemon/src/preferences.h
    	daemon/src/sip/sdp.cpp
    	daemon/src/sip/sdp.h
    	daemon/src/sip/sipaccount.cpp
    	daemon/src/sip/sipvoiplink.cpp
    	daemon/test/audiolayertest.h
    	daemon/test/gaincontroltest.cpp
    	daemon/test/sdptest.cpp
    	gnome/configure.ac
    	gnome/src/dbus/dbus.c
Code owners
Assign users and groups as approvers for specific file changes. Learn more.