-
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