Conflicts:
	sflphone-common/src/audio/audiorecorder.cpp
	sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
	sflphone-common/src/audio/dcblocker.cpp
	sflphone-common/src/audio/delaydetection.cpp
	sflphone-common/src/audio/echocancel.cpp
	sflphone-common/src/audio/jitterbuf.cpp
	sflphone-common/src/audio/pulseaudio/audiostream.cpp
	sflphone-common/src/audio/pulseaudio/pulselayer.cpp
	sflphone-common/src/audio/sound/audiofile.cpp
	sflphone-common/src/audio/speexechocancel.cpp
	sflphone-common/src/config/yamlengine.cpp
	sflphone-common/src/dbus/configurationmanager.cpp
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/preferences.cpp
	sflphone-common/src/sip/sipaccount.cpp
	sflphone-common/src/sip/sipvoiplink.cpp

	in main and in each threads

Conflicts:
	sflphone-client-gnome/src/main.c
	sflphone-client-gnome/src/sflphone_const.h